equal
deleted
inserted
replaced
289 if (ieProxyConfig.lpszAutoConfigUrl) { |
289 if (ieProxyConfig.lpszAutoConfigUrl) { |
290 autoConfigUrl = QString::fromWCharArray(ieProxyConfig.lpszAutoConfigUrl); |
290 autoConfigUrl = QString::fromWCharArray(ieProxyConfig.lpszAutoConfigUrl); |
291 GlobalFree(ieProxyConfig.lpszAutoConfigUrl); |
291 GlobalFree(ieProxyConfig.lpszAutoConfigUrl); |
292 } |
292 } |
293 if (ieProxyConfig.lpszProxy) { |
293 if (ieProxyConfig.lpszProxy) { |
294 proxyServerList << QString::fromWCharArray(ieProxyConfig.lpszProxy); |
294 // http://msdn.microsoft.com/en-us/library/aa384250%28VS.85%29.aspx speaks only about a "proxy URL", |
|
295 // not multiple URLs. However we tested this and it can return multiple URLs. So we use splitSpaceSemicolon |
|
296 // on it. |
|
297 proxyServerList = splitSpaceSemicolon(QString::fromWCharArray(ieProxyConfig.lpszProxy)); |
295 GlobalFree(ieProxyConfig.lpszProxy); |
298 GlobalFree(ieProxyConfig.lpszProxy); |
296 } |
299 } |
297 if (ieProxyConfig.lpszProxyBypass) { |
300 if (ieProxyConfig.lpszProxyBypass) { |
298 proxyBypass = splitSpaceSemicolon(QString::fromWCharArray(ieProxyConfig.lpszProxyBypass)); |
301 proxyBypass = splitSpaceSemicolon(QString::fromWCharArray(ieProxyConfig.lpszProxyBypass)); |
299 GlobalFree(ieProxyConfig.lpszProxyBypass); |
302 GlobalFree(ieProxyConfig.lpszProxyBypass); |