traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 88722 via svnmerge from 

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

........
  r88722 | giampaolo.rodola | 2011-03-03 14:57:47 +0100 (gio, 03 mar 2011) | 1 line

  Fix issue 11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors on accept(), recv() and send().
........
This commit is contained in:
Giampaolo Rodolà 2011-03-03 13:59:28 +00:00
parent c7eb7894d3
commit 9c9105dc81
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/asyncore.py
View File

@ -54,9 +54,10 @@ import warnings
import os import os
from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \ from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \
ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, errorcode ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, EPIPE, errorcode
_DISCONNECTED = frozenset((ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED)) _DISCONNECTED = frozenset((ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE,
EBADF))
try: try:
socket_map socket_map
@ -111,7 +112,7 @@ def readwrite(obj, flags):
if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL): if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
obj.handle_close() obj.handle_close()
except socket.error as e: except socket.error as e:
if e.args[0] not in (EBADF, ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED): if e.args[0] not in _DISCONNECTED:
obj.handle_error() obj.handle_error()
else: else:
obj.handle_close() obj.handle_close()
@ -355,7 +356,7 @@ class dispatcher:
except TypeError: except TypeError:
return None return None
except socket.error as why: except socket.error as why:
if why.args[0] in (EWOULDBLOCK, ECONNABORTED): if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN):
return None return None
else: else:
raise raise

3
Misc/NEWS
View File

@ -28,6 +28,9 @@ Core and Builtins
Library Library
------- -------
- Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors
on accept(), send() and recv().
- Issue #11326: Add the missing connect_ex() implementation for SSL sockets, - Issue #11326: Add the missing connect_ex() implementation for SSL sockets,
and make it work for non-blocking connects. and make it work for non-blocking connects.