mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-24 07:26:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 83705 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83705 | giampaolo.rodola | 2010-08-04 11:02:27 +0200 (mer, 04 ago 2010) | 1 line

  fix issue #2944: asyncore doesn't handle connection refused correctly (patch by Alexander Shigin). Merged from 2.7 branch.
........
This commit is contained in:
Giampaolo Rodolà 2010-08-04 09:04:53 +00:00
parent 8801f7add2
commit 8c5ced43a1
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/asyncore.py
View file

@ -426,8 +426,11 @@ class dispatcher:
self.handle_read() self.handle_read()
def handle_connect_event(self): 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.handle_connect()
self.connected = True
def handle_write_event(self): def handle_write_event(self):
if self.accepting: if self.accepting:

1
Misc/ACKS
View file

@ -856,3 +856,4 @@ Uwe Zessin
Tarek Ziadé Tarek Ziadé
Peter Åstrand Peter Åstrand
Fredrik Håård Fredrik Håård
Alexander Shigin

2
Misc/NEWS
View file

@ -84,6 +84,8 @@ C-API
Library Library
------- -------
- Issue #2944: asyncore doesn't handle connection refused correctly.
- Issue #3196: email header decoding is now forgiving if an RFC2047 - Issue #3196: email header decoding is now forgiving if an RFC2047
encoded word encoded in base64 is lacking padding. encoded word encoded in base64 is lacking padding.