summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-10-15 14:35:45 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2009-10-16 10:13:00 (GMT)
commite7a92a1b9ff31cf036982bee1221d7e7cb3aea6a (patch)
tree8defad1eeabc1827d1420203d35ff42b8570bf40 /src/network
parentfbe6a9aaae0c6de017af08150678bf2001284178 (diff)
downloadQt-e7a92a1b9ff31cf036982bee1221d7e7cb3aea6a.zip
Qt-e7a92a1b9ff31cf036982bee1221d7e7cb3aea6a.tar.gz
Qt-e7a92a1b9ff31cf036982bee1221d7e7cb3aea6a.tar.bz2
QNetworkProxyFactory: Never return empty list on windows
Task-number: Salesforce 00062670 Reviewed-by: Thiago
Diffstat (limited to 'src/network')
-rw-r--r--src/network/kernel/qnetworkproxy_win.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_win.cpp b/src/network/kernel/qnetworkproxy_win.cpp
index f0fff2f..2100215 100644
--- a/src/network/kernel/qnetworkproxy_win.cpp
+++ b/src/network/kernel/qnetworkproxy_win.cpp
@@ -398,7 +398,12 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro
if (isBypassed(query.peerHostName(), sp->proxyBypass))
return sp->defaultResult;
- return parseServerList(query, sp->proxyServerList);
+ QList<QNetworkProxy> result = parseServerList(query, sp->proxyServerList);
+ // In some cases, this was empty. See SF task 00062670
+ if (result.isEmpty())
+ return sp->defaultResult;
+
+ return result;
}
#else // !UNICODE