diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-12-13 21:26:39 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-12-15 17:51:20 (GMT) |
commit | cb51c2157f870a5c83ae6d9435ec4b1004392bc9 (patch) | |
tree | 9d6d73b5e86a6d51d92de0cf91540a9711f2b3f9 | |
parent | 3e7adcb80a86748608d5517413301cd2b1b8df78 (diff) | |
download | Qt-cb51c2157f870a5c83ae6d9435ec4b1004392bc9.zip Qt-cb51c2157f870a5c83ae6d9435ec4b1004392bc9.tar.gz Qt-cb51c2157f870a5c83ae6d9435ec4b1004392bc9.tar.bz2 |
Don't need to set FD_CLOEXEC since qt_safe_* will have done that.
Reviewed-By: Trust Me
-rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index f6bfbac..021acd0 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -202,9 +202,6 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc return false; } - // Ensure that the socket is closed on exec*(). - ::fcntl(socket, F_SETFD, FD_CLOEXEC); - socketDescriptor = socket; return true; } @@ -565,16 +562,6 @@ int QNativeSocketEnginePrivate::nativeAccept() #else int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); #endif - //check if we have valid descriptor at all - if(acceptedDescriptor > 0) { - // Ensure that the socket is closed on exec*() - ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC); - } -#ifdef Q_OS_SYMBIAN - else { - qWarning("QNativeSocketEnginePrivate::nativeAccept() - acceptedDescriptor <= 0"); - } -#endif return acceptedDescriptor; } |