diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-16 12:33:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-16 12:33:56 (GMT) |
| commit | e1de7eda203cef794bb48c01155a7eaea24f902d (patch) | |
| tree | 968ab42c0c4b295d4acbcde89f96caa7f17e8570 /src/network | |
| parent | 9fb4bcada38c9d7b71f956342627bbc0f90cc06a (diff) | |
| parent | 1b30b3a6726adf806ae221357393e562285e8346 (diff) | |
| download | Qt-e1de7eda203cef794bb48c01155a7eaea24f902d.zip Qt-e1de7eda203cef794bb48c01155a7eaea24f902d.tar.gz Qt-e1de7eda203cef794bb48c01155a7eaea24f902d.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
StrictlyEnforceRange with snapOneItem/Row and header behavior change
Release font engine refcount when done using it in QTextEngine
Migrate addMarkUp function to QChar.
update the proxy info before session is opened in QNAM by Aapo Makela
QSslCertificate: block all DigiNotar (intermediate and root) certs
QSslCertificate: also check common name for blacklisted certificates
Fix typo in header guard.
fix doc typo
Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
remove obsolete define
Fix assert error on Windows with a negative char.
Doc: Fixed the example of an encoded URL in the class description.
Added an additional check to workaround an issue on Windows.
Diffstat (limited to 'src/network')
| -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 58eb0d8..0b568d4 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -275,6 +275,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: |