Changeset 97154 in webkit

Timestamp:

Oct 11, 2011 9:13:11 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] WebProcess using proxy settings for localhost as well
​https://bugs.webkit.org/show_bug.cgi?id=69611

Patch by Gopal Raghavan <​gopal.1.raghavan@nokia.com> on 2011-10-11
Reviewed by Chang Shu.

Implemented checks in queryProxy to return QNetworkProxy::NoProxy for localhost and 127.0.0.1

• WebProcess/qt/WebProcessMainQt.cpp:

(WebKit::EnvHttpProxyFactory::queryProxy):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/qt/WebProcessMainQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-11  Gopal Raghavan  <gopal.1.raghavan@nokia.com>
+
+        [Qt] WebProcess using proxy settings for localhost as well
+        https://bugs.webkit.org/show_bug.cgi?id=69611
+
+        Reviewed by Chang Shu.
+
+        Implemented checks in queryProxy to return QNetworkProxy::NoProxy for localhost and 127.0.0.1
+
+        * WebProcess/qt/WebProcessMainQt.cpp:
+        (WebKit::EnvHttpProxyFactory::queryProxy):
+
 2011-10-11  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp

@@ -105 +105 @@
 {
     QString protocol = query.protocolTag().toLower();
-    if (protocol == QLatin1String("http"))
+    bool localHost = false;
+
+    if (!query.peerHostName().compare(QLatin1String("localhost"), Qt::CaseInsensitive) || !query.peerHostName().compare(QLatin1String("127.0.0.1"), Qt::CaseInsensitive))
+        localHost = true;
+    if (protocol == QLatin1String("http") && !localHost)
         return m_httpProxy;
-    else if (protocol == QLatin1String("https"))
+    if (protocol == QLatin1String("https") && !localHost)
         return m_httpsProxy;