From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Fri, 11 Feb 2011 13:04:18 +0000 (+0000)
Subject: asyncore: introduce a new 'closed' attribute to make sure that dispatcher gets closed... 
X-Git-Tag: v3.2rc3~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42e0b7f47ef3bd1fe3b20ae253c9f660092d2fa4;p=python

asyncore: introduce a new 'closed' attribute to make sure that dispatcher gets closed only once.
In different occasions close() might be called more than once, causing problems with already disconnected sockets/dispatchers.
---

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index f0712e2061..91c629bd0f 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -220,7 +220,7 @@ class dispatcher:
 
     connected = False
     accepting = False
-    closing = False
+    closed = False
     addr = None
     ignore_log_types = frozenset(['warning'])
 
@@ -393,14 +393,16 @@ class dispatcher:
                 raise
 
     def close(self):
-        self.connected = False
-        self.accepting = False
-        self.del_channel()
-        try:
-            self.socket.close()
-        except socket.error as why:
-            if why.args[0] not in (ENOTCONN, EBADF):
-                raise
+        if not self.closed:
+            self.closed = True
+            self.connected = False
+            self.accepting = False
+            self.del_channel()
+            try:
+                self.socket.close()
+            except socket.error as why:
+                if why.args[0] not in (ENOTCONN, EBADF):
+                    raise
 
     # cheap inheritance, used to pass all other attribute
     # references to the underlying socket object.