Merged extra paranoia from 2.2 branch

6e9580ca · 85b56f12 · 6e9580ca · 6e9580ca
Commit 6e9580ca authored Dec 21, 2000 by
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

ZServer/__init__.py ZServer/__init__.py +2 -1

lib/python/ZServer/__init__.py lib/python/ZServer/__init__.py +2 -1

No files found.
--- a/ZServer/__init__.py
+++ b/ZServer/__init__.py
@@ -126,7 +126,8 @@ try:
    import fcntl, FCNTL
    FCNTL.F_SETFD; FCNTL.FD_CLOEXEC
    def requestCloseOnExec(sock):
-        fcntl.fcntl(sock.fileno(), FCNTL.F_SETFD, FCNTL.FD_CLOEXEC)
+        try:    fcntl.fcntl(sock.fileno(), FCNTL.F_SETFD, FCNTL.FD_CLOEXEC)
+        except: pass

 except (ImportError, AttributeError):


--- a/lib/python/ZServer/__init__.py
+++ b/lib/python/ZServer/__init__.py
@@ -126,7 +126,8 @@ try:
    import fcntl, FCNTL
    FCNTL.F_SETFD; FCNTL.FD_CLOEXEC
    def requestCloseOnExec(sock):
-        fcntl.fcntl(sock.fileno(), FCNTL.F_SETFD, FCNTL.FD_CLOEXEC)
+        try:    fcntl.fcntl(sock.fileno(), FCNTL.F_SETFD, FCNTL.FD_CLOEXEC)
+        except: pass

 except (ImportError, AttributeError):