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

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 5d7bddaf84c48493e467f2b2ed690566f4e91bbe..7f42d39f331b261d7f2ba95bccef67445c3cc873 100644 (file)
--- 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 6bb9f9f1c1c843d439a80c871f35a8eb31879144..18ee9d30b2f0bcb8e4af2475f92d65c1c551e12d 100644 (file)
--- 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.