diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-16 00:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-16 00:00:13 (GMT) |
| commit | f992096a065c99f8307965f73e29ebad49ee6b9b (patch) | |
| tree | cc31ebf4d7a04e533eb9340114db14cc10e42b58 /src/network | |
| parent | 301ec400cf5257d0ce5aec7ac4a9e7a0edf77ca3 (diff) | |
| parent | 19f53dd23c29d9a6b256ea1473b118abcde3cc5a (diff) | |
| download | Qt-f992096a065c99f8307965f73e29ebad49ee6b9b.zip Qt-f992096a065c99f8307965f73e29ebad49ee6b9b.tar.gz Qt-f992096a065c99f8307965f73e29ebad49ee6b9b.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 15fda34..b9db7fe 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -788,6 +788,7 @@ void QHttpNetworkConnectionChannel::detectPipeliningSupport() && (!serverHeaderField.contains("Netscape-Enterprise/3.")) // this is adpoted from the knowledge of the Nokia 7.x browser team (DEF143319) && (!serverHeaderField.contains("WebLogic")) + && (!serverHeaderField.startsWith("Rocket")) // a Python Web Server, see Web2py.com ) { pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningProbablySupported; } else { |