diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-01-25 11:29:25 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-01-25 11:55:18 (GMT) |
commit | 855ce69f17f570bc91e02bfb34d9e3f1699b3b18 (patch) | |
tree | 0965e52e650510187d54c81e2de6c632d580f7a8 /src/network/socket/qnativesocketengine_win.cpp | |
parent | 797fff07e03e1ff07fe544bbf0cfa44c35099c09 (diff) | |
download | Qt-855ce69f17f570bc91e02bfb34d9e3f1699b3b18.zip Qt-855ce69f17f570bc91e02bfb34d9e3f1699b3b18.tar.gz Qt-855ce69f17f570bc91e02bfb34d9e3f1699b3b18.tar.bz2 |
QNativeSocketEngine_win: Don't mess with linger settings
Reviewed-by: thiago
Diffstat (limited to 'src/network/socket/qnativesocketengine_win.cpp')
-rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 7088a57..bbe9fde 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -1199,8 +1199,10 @@ void QNativeSocketEnginePrivate::nativeClose() #if defined (QTCPSOCKETENGINE_DEBUG) qDebug("QNativeSocketEnginePrivate::nativeClose()"); #endif - linger l = {1, 0}; - ::setsockopt(socketDescriptor, SOL_SOCKET, SO_DONTLINGER, (char*)&l, sizeof(l)); + // We were doing a setsockopt here before with SO_DONTLINGER. (However with kind of wrong + // usage of parameters, it wants a BOOL but we used a struct and pretended it to be bool). + // We don't think setting this option should be done here, if a user wants it she/he can + // do it manually with socketDescriptor()/setSocketDescriptor(); ::closesocket(socketDescriptor); } |