summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2010-08-04 08:58:38 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2010-08-04 08:58:38 (GMT)
commit042cf1ae8c7f1ba01901ea448ba74bc6dc23d4fc (patch)
tree4900bb765881033b38c594b5fb022c6ac0190277 /Lib
parentdba50788a75c8eb85337fe575ca9279713584196 (diff)
downloadcpython-042cf1ae8c7f1ba01901ea448ba74bc6dc23d4fc.zip
cpython-042cf1ae8c7f1ba01901ea448ba74bc6dc23d4fc.tar.gz
cpython-042cf1ae8c7f1ba01901ea448ba74bc6dc23d4fc.tar.bz2
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) ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/asyncore.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index d3301b0..16fe43a 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -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: