Title: [123890] trunk/Source/WebCore
Revision
123890
Author
[email protected]
Date
2012-07-27 11:04:45 -0700 (Fri, 27 Jul 2012)

Log Message

[BlackBerry] Update NetworkJob::sendRequestWithCredentials to use new getProxyAddress API
https://bugs.webkit.org/show_bug.cgi?id=92457

Patch by Joe Mason <[email protected]> on 2012-07-27
Reviewed by Yong Li.

getProxyAddress now returns "host:port", and getProxyPort is gone. Update NetworkJob to use
the new interface.

RIM PR: 176166
Internally reviewed by Jonathan Dong <[email protected]>

* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::sendRequestWithCredentials):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123889 => 123890)


--- trunk/Source/WebCore/ChangeLog	2012-07-27 17:59:36 UTC (rev 123889)
+++ trunk/Source/WebCore/ChangeLog	2012-07-27 18:04:45 UTC (rev 123890)
@@ -1,3 +1,19 @@
+2012-07-27  Joe Mason  <[email protected]>
+
+        [BlackBerry] Update NetworkJob::sendRequestWithCredentials to use new getProxyAddress API
+        https://bugs.webkit.org/show_bug.cgi?id=92457
+
+        Reviewed by Yong Li.
+
+        getProxyAddress now returns "host:port", and getProxyPort is gone. Update NetworkJob to use
+        the new interface.
+
+        RIM PR: 176166
+        Internally reviewed by Jonathan Dong <[email protected]>
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::sendRequestWithCredentials):
+
 2012-07-27  Kevin Ellis  <[email protected]>
 
         Improve touch adjustment for targetting small controls.

Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (123889 => 123890)


--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2012-07-27 17:59:36 UTC (rev 123889)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp	2012-07-27 18:04:45 UTC (rev 123890)
@@ -684,15 +684,19 @@
     if (!newURL.isValid())
         return false;
 
-    int port = 0;
+    String host;
+    int port;
     if (type == ProtectionSpaceProxyHTTP) {
-        std::stringstream toPort(BlackBerry::Platform::Client::get()->getProxyPort());
-        toPort >> port;
-    } else
+        String proxyAddress = BlackBerry::Platform::Client::get()->getProxyAddress(newURL.string().ascii().data()).c_str();
+        KURL proxyURL(KURL(), proxyAddress);
+        host = proxyURL.host();
+        port = proxyURL.port();
+    } else {
+        host = m_response.url().host();
         port = m_response.url().port();
+    }
 
-    ProtectionSpace protectionSpace((type == ProtectionSpaceProxyHTTP) ? BlackBerry::Platform::Client::get()->getProxyAddress().c_str() : m_response.url().host()
-            , port, type, realm, scheme);
+    ProtectionSpace protectionSpace(host, port, type, realm, scheme);
 
     // We've got the scheme and realm. Now we need a username and password.
     // First search the CredentialStorage.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to