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

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

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 4f1153b760b..3672db9f0fd 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -101,10 +101,16 @@ 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, e:
+        if e.args[0] not in (EBADF, ECONNRESET, ENOTCONN, ESHUTDOWN,
+ECONNABORTED):
+            obj.handle_error()
+        else:
+            obj.handle_close()
     except _reraised_exceptions:
         raise
     except: