diff options
Diffstat (limited to 'net-im/gajim-devel/files/patch-Changeset6314')
| -rw-r--r-- | net-im/gajim-devel/files/patch-Changeset6314 | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/net-im/gajim-devel/files/patch-Changeset6314 b/net-im/gajim-devel/files/patch-Changeset6314 new file mode 100644 index 000000000000..c828e687ffcc --- /dev/null +++ b/net-im/gajim-devel/files/patch-Changeset6314 @@ -0,0 +1,39 @@ +diff -urN gajim-0.10/src/common/proxy65_manager.py gajim-0.10-patched/src/common/proxy65_manager.py +--- src/common/proxy65_manager.py Mon May 1 18:49:14 2006 ++++ src/common/proxy65_manager.py Tue May 16 19:55:10 2006 +@@ -15,6 +15,7 @@ + ## + import socket + import struct ++import errno + + import common.xmpp + from common import gajim +@@ -246,16 +247,18 @@ + self._recv=self._sock.recv + except Exception, ee: + (errnum, errstr) = ee +- if errnum == 111: +- self.on_failure() +- return None ++ if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): ++ # still trying to connect ++ return + # 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 ++ if errnum not in (0, 10056, errno.EISCONN): ++ # connection failed ++ self.on_failure() ++ 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 + self.idlequeue.plug_idle(self, True, False) |