Changeset 6386

Timestamp:

05/31/06 14:44:46 (3 years ago)

Author:

dkirov

Message:

merging with r6314

Files:

• branches/gajim_0.10/src/common/proxy65_manager.py (modified) (2 diffs)

branches/gajim_0.10/src/common/proxy65_manager.py

@@ -16 +16 @@
 import socket 
 import struct
+import errno
 
 import common.xmpp
@@ -247 +248 @@
                 except Exception, ee:
                         (errnum, errstr) = ee
-                        if errnum == 111:
+                        if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): 
+                                # still trying to connect
+                                return
+                        # win32 needs this
+                        if errnum not in (0, 10056, errno.EISCONN):
+                                # connection failed
                                 self.on_failure()
-                                return None
-                        # win32 needs this
-                        elif errnum != 10056 or self.state != 0:
-                                return None
-                        else: # socket is already connected
-                                self._sock.setblocking(False)
-                                self._send=self._sock.send
-                                self._recv=self._sock.recv
+                                return
+                        # socket is already connected
+                        self._sock.setblocking(False)
+                        self._send=self._sock.send
+                        self._recv=self._sock.recv
                 self.buff = ''
                 self.state = 1 # connected