diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-14 21:39:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-14 21:39:23 (GMT) |
| commit | f118ef8c92953335960e37634a23a344750eff73 (patch) | |
| tree | 3e47d52c2f744798844123ddfc888e32bc1a4c01 /src/network/access | |
| parent | f37db56dda632d4a7e2e0301756331697f72b65a (diff) | |
| parent | a32bfdef6d6b45c916f143dcf8495a2e102c3eec (diff) | |
| download | Qt-f118ef8c92953335960e37634a23a344750eff73.zip Qt-f118ef8c92953335960e37634a23a344750eff73.tar.gz Qt-f118ef8c92953335960e37634a23a344750eff73.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
network auto tests: add QNetworkReply test for pipelining
HTTP: blacklist server for pipelining
Diffstat (limited to 'src/network/access')
| -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 { |