Merged revisions 83703 via svnmerge from
authorGiampaolo Rodolà <g.rodola@gmail.com>
Wed, 4 Aug 2010 08:58:38 +0000 (08:58 +0000)
committerGiampaolo Rodolà <g.rodola@gmail.com>
Wed, 4 Aug 2010 08:58:38 +0000 (08:58 +0000)
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)
........

Lib/asyncore.py
Misc/ACKS
Misc/NEWS

index d3301b0052e9001c3c543f58c0dc75333bf9db39..16fe43a237bd9cf65e9e5d674ae0ad902db3359f 100644 (file)
@@ -422,8 +422,11 @@ class dispatcher:
             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:
index 757bc1d90d2190624f3721a5f0ceb388d93adc62..d94790e10f3102abe92df6d7447374a450e55224 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -817,3 +817,4 @@ Tarek Ziad
 Peter Åstrand
 Jesse Noller
 Fredrik Håård
+Alexander Shigin
index ca9d8f779fefbfd73d8fa0506a98ae8a3a98a25b..d6ac5a862bb24db400eb6da47eb5b59c4a12ef53 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,8 @@ C-API
 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.