Changeset 3c88759

Timestamp:

2012-04-22T21:53:57Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d527913

Parents:

e93fa05 (diff), 9ce44dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge skyped bugfix (#945).

File:

• protocols/skype/skyped.py (modified) (2 diffs)

protocols/skype/skyped.py

@@ -32 +32 @@
 from ConfigParser import ConfigParser, NoOptionError
 from traceback import print_exception
+from fcntl import fcntl, F_SETFD, FD_CLOEXEC
 import ssl
 
@@ -185 +186 @@
                 sock = socket.socket()
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        fcntl(sock, F_SETFD, FD_CLOEXEC);
         sock.bind((host, port))
         sock.listen(1)
+
         if hasgobject:
                 gobject.io_add_watch(sock, gobject.IO_IN, listener)