Fixes #1550

stamparm · stamparm · commit a5489516ebbf · 2015-11-20T16:52:59.000+01:00
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -1027,24 +1027,26 @@ def _setSocketPreConnect():
     def _():
         while kb.threadContinue:
             try:
-                for address in socket._ready:
-                    if len(socket._ready[address]) < SOCKET_PRE_CONNECT_QUEUE_SIZE:
-                        s = socket.socket()
+                for key in socket._ready:
+                    if len(socket._ready[key]) < SOCKET_PRE_CONNECT_QUEUE_SIZE:
+                        family, type, proto, address = key
+                        s = socket.socket(family, type, proto)
                         s._connect(address)
                         with kb.locks.socket:
-                            socket._ready[address].append(s._sock)
+                            socket._ready[key].append(s._sock)
             except socket.error:
                 pass
             finally:
                 time.sleep(0.01)
 
     def connect(self, address):
         found = False
+        key = (self.family, self.type, self.proto, address)
         with kb.locks.socket:
-            if address not in socket._ready:
-                socket._ready[address] = []
-            if len(socket._ready[address]) > 0:
-                self._sock = socket._ready[address].pop(0)
+            if key not in socket._ready:
+                socket._ready[key] = []
+            if len(socket._ready[key]) > 0:
+                self._sock = socket._ready[key].pop(0)
                 found = True
         if not found:
             self._connect(address)
