From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Tue, 20 Mar 2012 15:46:57 +0000 (+0100)
Subject: Fix issue #13694: asynchronous connect in asyncore.dispatcher does not set addr.
X-Git-Tag: v2.7.4rc1~954^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d3cf48e53404996cff2e5a7e35812245b3e0a31;p=thirdparty%2FPython%2Fcpython.git

Fix issue #13694: asynchronous connect in asyncore.dispatcher does not set addr.
---

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 35db3875d1e8..d8d28a467be6 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -345,6 +345,7 @@ class dispatcher:
         err = self.socket.connect_ex(address)
         if err in (EINPROGRESS, EALREADY, EWOULDBLOCK) \
         or err == EINVAL and os.name in ('nt', 'ce'):
+            self.addr = address
             return
         if err in (0, EISCONN):
             self.addr = address
diff --git a/Misc/NEWS b/Misc/NEWS
index 0e12494e24ad..0b3668fe39fb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #13694: asynchronous connect in asyncore.dispatcher does not set addr
+  attribute.
+
 - Issue #10484: Fix the CGIHTTPServer's PATH_INFO handling problem.
 
 - Issue #11199: Fix the with urllib which hangs on particular ftp urls.