summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKranthi Kuntala <kranthi.kumar-kuntala@nokia.com>2011-09-08 10:33:19 (GMT)
committerKranthi Kuntala <kranthi.kumar-kuntala@nokia.com>2011-09-08 10:40:56 (GMT)
commit695ef14f443ef992f62203949fc1565b11fdf621 (patch)
treed28ed75e4b7a0ad3feb20f6147324e72cc083495
parent7d857bee73c9e81da203543a132b5b836853b797 (diff)
downloadQt-695ef14f443ef992f62203949fc1565b11fdf621.zip
Qt-695ef14f443ef992f62203949fc1565b11fdf621.tar.gz
Qt-695ef14f443ef992f62203949fc1565b11fdf621.tar.bz2
update the proxy info before session is opened in QNAM by Aapo Makela
Reviewed-By: Kranthi Kuntala <kranthi.kumar-kuntala@nokia.com>
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp5
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: