diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:06:39 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-04-15 07:06:39 (GMT) |
| commit | 519bf02008b8e6f1bf5154ce5c384049c3ebb0d7 (patch) | |
| tree | aa325674b7f86749d630f5eb587651007f6a10ca /src/network/access | |
| parent | 6e189eb28161f2d09e0c71ecd590b7ccfd82321c (diff) | |
| parent | 414ff1be28af440f1e01a38e497227f3849e8e54 (diff) | |
| download | Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.zip Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.tar.gz Qt-519bf02008b8e6f1bf5154ce5c384049c3ebb0d7.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/qconfig
Diffstat (limited to 'src/network/access')
| -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 17b864c..4a31b6f 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -691,6 +691,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 { |