diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2009-11-20 13:21:15 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2009-11-24 09:12:44 (GMT) |
commit | 32ea1aedcf1f588da1ac112bb615088d954b84e1 (patch) | |
tree | a761b1c57cfb34eea0577653fabbb14740ef6e98 /src | |
parent | 8d4238fa695ed4998692c7cee861df0470a5cc06 (diff) | |
download | Qt-32ea1aedcf1f588da1ac112bb615088d954b84e1.zip Qt-32ea1aedcf1f588da1ac112bb615088d954b84e1.tar.gz Qt-32ea1aedcf1f588da1ac112bb615088d954b84e1.tar.bz2 |
Fix QWindowsSystemProxy::init
Seems like WinHttpGetIEProxyConfigForCurrentUser can return more
than one proxy even if this is not documented.
Task-number: QTBUG-5981
Reviewed-by: Peter Hartmann
Diffstat (limited to 'src')
-rw-r--r-- | src/network/kernel/qnetworkproxy_win.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp index 6f92424..0e2dd2b 100644 --- a/src/network/kernel/qnetworkproxy_win.cpp +++ b/src/network/kernel/qnetworkproxy_win.cpp @@ -291,7 +291,10 @@ void QWindowsSystemProxy::init() GlobalFree(ieProxyConfig.lpszAutoConfigUrl); } if (ieProxyConfig.lpszProxy) { - proxyServerList << QString::fromWCharArray(ieProxyConfig.lpszProxy); + // http://msdn.microsoft.com/en-us/library/aa384250%28VS.85%29.aspx speaks only about a "proxy URL", + // not multiple URLs. However we tested this and it can return multiple URLs. So we use splitSpaceSemicolon + // on it. + proxyServerList = splitSpaceSemicolon(QString::fromWCharArray(ieProxyConfig.lpszProxy)); GlobalFree(ieProxyConfig.lpszProxy); } if (ieProxyConfig.lpszProxyBypass) { |