diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 15:26:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 15:26:02 +0100 |
| commit | c8046f7d42b565e7fc02aa6228c72eee5ab51605 (patch) | |
| tree | eee9ea01acd97d156a9c3466251d3023feef9d82 /src/network/socket | |
| parent | ae56140b50bccde9e6cfdc6757f345c989ccd755 (diff) | |
| parent | ffac6ee2673a573a9db4f75a89c4c53251fa1304 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0b021b369725b73f09faa14b9da9e2431dc24fad
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 3027b77161..751ac9b182 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -496,6 +496,9 @@ bool QNativeSocketEnginePrivate::setOption(QNativeSocketEngine::SocketOption opt n = SO_RCVBUF; break; case QNativeSocketEngine::SendBufferSocketOption: + // see QTBUG-30478 SO_SNDBUF should not be used on Vista or later + if (QSysInfo::windowsVersion() >= QSysInfo::WV_VISTA) + return false; n = SO_SNDBUF; break; case QNativeSocketEngine::BroadcastSocketOption: |