diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-08 10:58:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-08 10:58:32 (GMT) |
| commit | d8755b9b246cce66cace5225ad04f6a1d0b99e14 (patch) | |
| tree | c5d63557b3d861e6075f72634ec8b354508fb013 | |
| parent | c22daf60d6b2360271f1ed50510749b2ae401c7b (diff) | |
| parent | 695ef14f443ef992f62203949fc1565b11fdf621 (diff) | |
| download | Qt-d8755b9b246cce66cace5225ad04f6a1d0b99e14.zip Qt-d8755b9b246cce66cace5225ad04f6a1d0b99e14.tar.gz Qt-d8755b9b246cce66cace5225ad04f6a1d0b99e14.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
update the proxy info before session is opened in QNAM by Aapo Makela
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 8a0a944..a7a6287 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -253,6 +253,11 @@ void QNetworkReplyImplPrivate::_q_networkSessionConnected() if (session->state() != QNetworkSession::Connected) return; + #ifndef QT_NO_NETWORKPROXY + // Re-set proxies here as new session might have changed them + proxyList = manager->d_func()->queryProxy(QNetworkProxyQuery(request.url())); + #endif + switch (state) { case QNetworkReplyImplPrivate::Buffering: case QNetworkReplyImplPrivate::Working: |