summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/asyncore.py5
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
3 files changed, 7 insertions, 1 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index f066e76..7b922a9 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -426,8 +426,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:
diff --git a/Misc/ACKS b/Misc/ACKS
index 6486e79..15c0aed 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -856,3 +856,4 @@ Uwe Zessin
Tarek Ziadé
Peter Åstrand
Fredrik Håård
+Alexander Shigin
diff --git a/Misc/NEWS b/Misc/NEWS
index 262bd5e..5eb9672 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,6 +84,8 @@ C-API
Library
-------
+- Issue #2944: asyncore doesn't handle connection refused correctly.
+
- Issue #3196: email header decoding is now forgiving if an RFC2047
encoded word encoded in base64 is lacking padding.