diff options
author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-05-08 18:09:02 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 01:42:02 +0200 |
commit | d3781ab09c00dd39f97e8529311b1177506022dc (patch) | |
tree | 8828142d69d322cceee59062e6288d38d6308118 | |
parent | ad97aba452ed7d3dbd3c9d437c59c14b2ae0661b (diff) |
Don't return http proxy for server usages
Http proxy cannot support server sockets or udp sockets, so don't
offer it as the system proxy (in the generic environment variables
implementation)
Change-Id: I234ab1024952b2630e668ddc35c665efade8e2b9
Reviewed-by: Adrien Bustany <adrien@bustany.org>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
-rw-r--r-- | src/network/kernel/qnetworkproxy_generic.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy_generic.cpp b/src/network/kernel/qnetworkproxy_generic.cpp index 61aedbe4fb..bb3ae4760f 100644 --- a/src/network/kernel/qnetworkproxy_generic.cpp +++ b/src/network/kernel/qnetworkproxy_generic.cpp @@ -119,7 +119,9 @@ QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkPro url.port() ? url.port() : 1080, url.userName(), url.password()); proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability); proxyList << proxy; - } else if (url.scheme() == QLatin1String("http") || url.scheme().isEmpty()) { + } else if ((url.scheme() == QLatin1String("http") || url.scheme().isEmpty()) + && query.queryType() != QNetworkProxyQuery::UdpSocket + && query.queryType() != QNetworkProxyQuery::TcpServer) { QNetworkProxy proxy(QNetworkProxy::HttpProxy, url.host(), url.port() ? url.port() : 8080, url.userName(), url.password()); proxyList << proxy; |