From d3781ab09c00dd39f97e8529311b1177506022dc Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Tue, 8 May 2012 18:09:02 +0100 Subject: 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 Reviewed-by: Martin Petersson --- src/network/kernel/qnetworkproxy_generic.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/network/kernel/qnetworkproxy_generic.cpp') 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 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; -- cgit v1.2.3