diff options
| author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-02-22 20:20:27 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-09 16:15:35 (GMT) |
| commit | c48a8f307bf88244483443e72cb35c9b0ae187ff (patch) | |
| tree | 7552346c1fc64933d6112888daebeaa751e6bc6f /src/network/kernel | |
| parent | 43d0891343e6d6ad9cf137dca7dba0e63d2e1851 (diff) | |
| download | Qt-c48a8f307bf88244483443e72cb35c9b0ae187ff.zip Qt-c48a8f307bf88244483443e72cb35c9b0ae187ff.tar.gz Qt-c48a8f307bf88244483443e72cb35c9b0ae187ff.tar.bz2 | |
Windows - handle proxy autoconfiguration resulting in no proxy
The PAC file may result in direct connection, in which case
WinHttp returns null strings for the proxies and the connection
type marked as direct.
In this case, return the default list (no proxy)
Change-Id: I601033f56a841bb92ea80a28174bb993b024ad79
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 25c05ce3bb8b53ed937363492b8222ee3b83d749)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 43b9636..9cfa42c 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -417,6 +417,8 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro if (proxyInfo.lpszProxyBypass) GlobalFree(proxyInfo.lpszProxyBypass); + if (proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY) + return sp->defaultResult; //i.e. the PAC file result was "DIRECT" if (isBypassed(query.peerHostName(), splitSpaceSemicolon(proxyBypass))) return sp->defaultResult; return parseServerList(query, proxyServerList); |