aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2012-04-22 22:53:57 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2012-04-22 22:53:57 +0100
commit3c88759d7082945ef2d865f6b0c7a01213547a34 (patch)
tree2f04d82cedc271ddbef66d4af1311a57b8edc14d
parente93fa057d26a4b06d17b619de541e3cba3006008 (diff)
parent9ce44dd377c6a07f6bed78dcbfe83b5b00e15b6d (diff)
Merge skyped bugfix (#945).
-rw-r--r--protocols/skype/skyped.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/protocols/skype/skyped.py b/protocols/skype/skyped.py
index 3b6499c1..07c08435 100644
--- a/protocols/skype/skyped.py
+++ b/protocols/skype/skyped.py
@@ -31,6 +31,7 @@ import Skype4Py
import hashlib
from ConfigParser import ConfigParser, NoOptionError
from traceback import print_exception
+from fcntl import fcntl, F_SETFD, FD_CLOEXEC
import ssl
__version__ = "0.1.1"
@@ -184,8 +185,10 @@ def server(host, port, skype = None):
else:
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)
else: