[Python-Dev] [Python-checkins] r83704 - in python/branches/release26-maint: Lib/asyncore.py Misc/ACKS Misc/NEWS

[Barry Warsaw]

Hi Giampaolo,

Now that we're in quasi-freeze for 2.6.6 final, this is the kind of change I'd
like to review before backporting.  In this case, I'll let it through, but
please check with me first next time.

And thanks for your work!
-Barry

On Aug 04, 2010, at 10:58 AM, giampaolo.rodola wrote:

>Author: giampaolo.rodola
>Date: Wed Aug  4 10:58:38 2010
>New Revision: 83704
>
>Log:
>Merged revisions 83703 via svnmerge from 
>svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
>
>........
>  r83703 | giampaolo.rodola | 2010-08-04 10:35:25 +0200 (mer, 04 ago
> 2010) | 1 line 
>  fix issue #2944: asyncore doesn't handle connection refused
> correctly (patch by Alexander Shigin)
>........
>
>
>Modified:
>   python/branches/release26-maint/   (props changed)
>   python/branches/release26-maint/Lib/asyncore.py
>   python/branches/release26-maint/Misc/ACKS
>   python/branches/release26-maint/Misc/NEWS
>
>Modified: python/branches/release26-maint/Lib/asyncore.py
>==============================================================================
>--- python/branches/release26-maint/Lib/asyncore.py	(original)
>+++ python/branches/release26-maint/Lib/asyncore.py	Wed Aug  4
>10:58:38 2010 @@ -422,8 +422,11 @@
>             self.handle_read()
> 
>     def handle_connect_event(self):
>-        self.connected = True
>+        err = self.socket.getsockopt(socket.SOL_SOCKET,
>socket.SO_ERROR)
>+        if err != 0:
>+            raise socket.error(err, _strerror(err))
>         self.handle_connect()
>+        self.connected = True
> 
>     def handle_write_event(self):
>         if self.accepting:
>
>Modified: python/branches/release26-maint/Misc/ACKS
>==============================================================================
>--- python/branches/release26-maint/Misc/ACKS	(original)
>+++ python/branches/release26-maint/Misc/ACKS	Wed Aug  4
>10:58:38 2010 @@ -817,3 +817,4 @@
> Peter Åstrand
> Jesse Noller
> Fredrik Håård
>+Alexander Shigin
>
>Modified: python/branches/release26-maint/Misc/NEWS
>==============================================================================
>--- python/branches/release26-maint/Misc/NEWS	(original)
>+++ python/branches/release26-maint/Misc/NEWS	Wed Aug  4
>10:58:38 2010 @@ -89,6 +89,8 @@
> Library
> -------
> 
>+- Issue #2944: asyncore doesn't handle connection refused correctly.
>+
> - Issue #8447: Make distutils.sysconfig follow symlinks in the path to
>   the interpreter executable.  This fixes a failure of
> test_httpservers on OS X.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://mail.python.org/pipermail/python-dev/attachments/20100804/7658ff02/attachment.pgp>