diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:55:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 20:55:03 (GMT) |
| commit | 0dbd8f1b0a6df20e5502bb35e58490a9f99953a7 (patch) | |
| tree | cf27566f41ea9ebedd166941cfeffe2c4930b094 /src/network | |
| parent | ac187c6e40d5142a2811be30f0e5035581e14859 (diff) | |
| parent | c0e9740fe15b3034091118b593359b4b9b4cbe87 (diff) | |
| download | Qt-0dbd8f1b0a6df20e5502bb35e58490a9f99953a7.zip Qt-0dbd8f1b0a6df20e5502bb35e58490a9f99953a7.tar.gz Qt-0dbd8f1b0a6df20e5502bb35e58490a9f99953a7.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QNX screen initialization
tst_qftp: Attempting to reproduce a crash
QNAM HTTP: Do not pipeline with WebLogic servers
Autotest: update path location on the test server
Autotest: update location of fluke.gif on test server
Make qsTr work in global scope
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index bc7684a..83b7d4c 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -690,6 +690,8 @@ void QHttpNetworkConnectionChannel::detectPipeliningSupport() && (serverHeaderField = reply->headerField("Server"), !serverHeaderField.contains("Microsoft-IIS/4.")) && (!serverHeaderField.contains("Microsoft-IIS/5.")) && (!serverHeaderField.contains("Netscape-Enterprise/3.")) + // this is adpoted from the knowledge of the Nokia 7.x browser team (DEF143319) + && (!serverHeaderField.contains("WebLogic")) ) { pipeliningSupported = QHttpNetworkConnectionChannel::PipeliningProbablySupported; } else { |