From: Charles-François Natali <neologix@free.fr>
Date: Thu, 14 Jul 2011 17:57:35 +0000 (+0200)
Subject: Merge - Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
X-Git-Tag: v3.2.2rc1~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f0ccfa853dcc68d3c2d5b92d22fa0c8e1321b63;p=thirdparty%2FPython%2Fcpython.git

Merge - Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
---

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 5d7bddaf84c4..7f42d39f331b 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -132,7 +132,8 @@ def poll(timeout=0.0, map=None):
             is_w = obj.writable()
             if is_r:
                 r.append(fd)
-            if is_w:
+            # accepting sockets should not be writable
+            if is_w and not obj.accepting:
                 w.append(fd)
             if is_r or is_w:
                 e.append(fd)
@@ -179,7 +180,8 @@ def poll2(timeout=0.0, map=None):
             flags = 0
             if obj.readable():
                 flags |= select.POLLIN | select.POLLPRI
-            if obj.writable():
+            # accepting sockets should not be writable
+            if obj.writable() and not obj.accepting:
                 flags |= select.POLLOUT
             if flags:
                 # Only check for exceptions if object was either readable
diff --git a/Misc/NEWS b/Misc/NEWS
index 6bb9f9f1c1c8..18ee9d30b2f0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
+
 - Issue #4376: ctypes now supports nested structures in a endian different than
   the parent structure. Patch by Vlad Riscutia.