From 0abc64d71986902c5ff7e7b9d9fd5c83428ca80b Mon Sep 17 00:00:00 2001
From: Josiah Carlson <josiah.carlson@gmail.com>
Date: Wed, 3 Jun 2009 19:48:02 +0000
Subject: This fixes bug 5798 on OS X. This should also fix disconnect behavior
 cross-platform.

---
 Lib/asyncore.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index e4f9bf9..db426d7 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -100,10 +100,15 @@ def readwrite(obj, flags):
             obj.handle_read_event()
         if flags & select.POLLOUT:
             obj.handle_write_event()
-        if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
-            obj.handle_close()
         if flags & select.POLLPRI:
             obj.handle_expt_event()
+        if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
+            obj.handle_close()
+    except socket.error as e:
+        if e.args[0] not in (EBADF, ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED):
+            obj.handle_error()
+        else:
+            obj.handle_close()
     except _reraised_exceptions:
         raise
     except:
-- 
cgit v0.12