diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-09-09 10:19:02 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-09-09 10:19:02 (GMT) |
| commit | b03eac0d7d31c878fef7799367c148196de8a13f (patch) | |
| tree | a11c948e1bda056271a839fdc3eb923a0e6cb32e | |
| parent | b57441f1ce276287835a19ca5fe203e9527186a0 (diff) | |
| parent | d8755b9b246cce66cace5225ad04f6a1d0b99e14 (diff) | |
| download | Qt-b03eac0d7d31c878fef7799367c148196de8a13f.zip Qt-b03eac0d7d31c878fef7799367c148196de8a13f.tar.gz Qt-b03eac0d7d31c878fef7799367c148196de8a13f.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.7' into 4.7
| -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: |