diff options
| author | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-17 13:59:53 (GMT) |
|---|---|---|
| committer | Pasi Pentikainen <pasi.a.pentikainen@nokia.com> | 2011-11-17 13:59:53 (GMT) |
| commit | 12e40dc6350ce37a6108c62d3c954a50df621dbd (patch) | |
| tree | 0fd5eb966de7b9124c1af2e9355ce8e594ad7b4d /src/network/access/qhttpnetworkconnectionchannel.cpp | |
| parent | 574464cd7e2940f2dadc4d556e24b944cf222f3d (diff) | |
| parent | b0d54f150e9b4211e263b4835dd2c64ac07a8c86 (diff) | |
| download | Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.zip Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.tar.gz Qt-12e40dc6350ce37a6108c62d3c954a50df621dbd.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel.cpp')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp index 9b2a6e8..b9db7fe 100644 --- a/src/network/access/qhttpnetworkconnectionchannel.cpp +++ b/src/network/access/qhttpnetworkconnectionchannel.cpp @@ -201,7 +201,6 @@ bool QHttpNetworkConnectionChannel::sendRequest() || (!url.password().isEmpty() && url.password() != auth.password())) { auth.setUser(url.userName()); auth.setPassword(url.password()); - emit reply->cacheCredentials(request, &auth); connection->d_func()->copyCredentials(connection->d_func()->indexOf(socket), &auth, false); } // clear the userinfo, since we use the same request for resending @@ -789,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 { |