Title: [115284] trunk/Source/WebCore
- Revision
- 115284
- Author
- commit-qu...@webkit.org
- Date
- 2012-04-25 21:03:27 -0700 (Wed, 25 Apr 2012)
Log Message
[BlackBerry] Authenticated proxy isn't working.
https://bugs.webkit.org/show_bug.cgi?id=84579
Patch by Jason Liu <jason....@torchmobile.com.cn> on 2012-04-25
Reviewed by Antonio Gomes.
We should try to get username and password from WiFi advanced configuration first
when 407 is received.
No new tests. This is covered by existing http tests when proxy's username and password
are configured for WiFi.
* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::sendRequestWithCredentials):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115283 => 115284)
--- trunk/Source/WebCore/ChangeLog 2012-04-26 02:26:05 UTC (rev 115283)
+++ trunk/Source/WebCore/ChangeLog 2012-04-26 04:03:27 UTC (rev 115284)
@@ -1,3 +1,19 @@
+2012-04-25 Jason Liu <jason....@torchmobile.com.cn>
+
+ [BlackBerry] Authenticated proxy isn't working.
+ https://bugs.webkit.org/show_bug.cgi?id=84579
+
+ Reviewed by Antonio Gomes.
+
+ We should try to get username and password from WiFi advanced configuration first
+ when 407 is received.
+
+ No new tests. This is covered by existing http tests when proxy's username and password
+ are configured for WiFi.
+
+ * platform/network/blackberry/NetworkJob.cpp:
+ (WebCore::NetworkJob::sendRequestWithCredentials):
+
2012-04-25 Alec Flett <alecfl...@chromium.org>
IndexedDB: implement cursor.advance()
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (115283 => 115284)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-04-26 02:26:05 UTC (rev 115283)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp 2012-04-26 04:03:27 UTC (rev 115284)
@@ -855,19 +855,26 @@
if (!m_frame || !m_frame->loader() || !m_frame->loader()->client())
return false;
- // Before asking the user for credentials, we check if the URL contains that.
- if (!m_handle->getInternal()->m_user.isEmpty() && !m_handle->getInternal()->m_pass.isEmpty()) {
- username = m_handle->getInternal()->m_user.utf8().data();
- password = m_handle->getInternal()->m_pass.utf8().data();
+ if (type == ProtectionSpaceProxyHTTP) {
+ username = BlackBerry::Platform::Client::get()->getProxyUsername().c_str();
+ password = BlackBerry::Platform::Client::get()->getProxyPassword().c_str();
+ }
- // Prevent them from been used again if they are wrong.
- // If they are correct, they will the put into CredentialStorage.
- m_handle->getInternal()->m_user = "";
- m_handle->getInternal()->m_pass = "";
- } else {
- Credential inputCredential = m_frame->page()->chrome()->client()->platformPageClient()->authenticationChallenge(newURL, protectionSpace);
- username = inputCredential.user();
- password = inputCredential.password();
+ if (username.isEmpty() || password.isEmpty()) {
+ // Before asking the user for credentials, we check if the URL contains that.
+ if (!m_handle->getInternal()->m_user.isEmpty() && !m_handle->getInternal()->m_pass.isEmpty()) {
+ username = m_handle->getInternal()->m_user.utf8().data();
+ password = m_handle->getInternal()->m_pass.utf8().data();
+
+ // Prevent them from been used again if they are wrong.
+ // If they are correct, they will the put into CredentialStorage.
+ m_handle->getInternal()->m_user = "";
+ m_handle->getInternal()->m_pass = "";
+ } else {
+ Credential inputCredential = m_frame->page()->chrome()->client()->platformPageClient()->authenticationChallenge(newURL, protectionSpace);
+ username = inputCredential.user();
+ password = inputCredential.password();
+ }
}
if (username.isEmpty() && password.isEmpty())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
