Changeset 138977 in webkit

Timestamp:

Jan 7, 2013 12:47:54 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Handle the new AuthRetry result code in NetworkJob::notifyAuthReceived
​https://bugs.webkit.org/show_bug.cgi?id=106233

Patch by Joe Mason <​jmason@rim.com> on 2013-01-07
Reviewed by Rob Buis.

Internal PR: 270683
FilterStream::notifyAuthReceived has a new result code, AuthRetry. When it's received we
need to handle it by resending the request with the same credentials.

Reviewed internally by Leo Yang.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::notifyAuthReceived):

• platform/network/blackberry/NetworkJob.h:

(NetworkJob):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/blackberry/NetworkJob.cpp (modified) (3 diffs)
• platform/network/blackberry/NetworkJob.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Joe Mason  <jmason@rim.com>
+
+        [BlackBerry] Handle the new AuthRetry result code in NetworkJob::notifyAuthReceived
+        https://bugs.webkit.org/show_bug.cgi?id=106233
+
+        Reviewed by Rob Buis.
+
+        Internal PR: 270683
+        FilterStream::notifyAuthReceived has a new result code, AuthRetry. When it's received we
+        need to handle it by resending the request with the same credentials.
+
+        Reviewed internally by Leo Yang.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::notifyAuthReceived):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+
 2013-01-07  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp

@@ -253 +253 @@
 }
 
-void NetworkJob::notifyAuthReceived(BlackBerry::Platform::NetworkRequest::AuthType authType, const char* realm, bool success, bool requireCredentials)
+void NetworkJob::notifyAuthReceived(BlackBerry::Platform::NetworkRequest::AuthType authType, const char* realm, AuthResult result, bool requireCredentials)
 {
     using BlackBerry::Platform::NetworkRequest;
@@ -293 +293 @@
     }
 
-    if (success) {
+    // On success, update stored credentials if necessary
+    // On failure, purge credentials and send new request
+    // On retry, update stored credentials if necessary and send new request
+    if (result == AuthResultFailure)
+        purgeCredentials();
+    else {
         // Update the credentials that will be stored to match the scheme that was actually used
         AuthenticationChallenge& challenge = m_handle->getInternal()->m_currentWebChallenge;
@@ -308 +313 @@
         }
         storeCredentials();
-        return;
-    }
-
-    purgeCredentials();
-    m_newJobWithCredentialsStarted = sendRequestWithCredentials(serverType, scheme, realm, requireCredentials);
+    }
+    if (result != AuthResultSuccess)
+        m_newJobWithCredentialsStarted = sendRequestWithCredentials(serverType, scheme, realm, requireCredentials);
 }
 

trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h

@@ -74 +74 @@
     virtual void notifyHeadersReceived(const BlackBerry::Platform::NetworkRequest::HeaderList& headers);
     virtual void notifyMultipartHeaderReceived(const char* key, const char* value);
-    virtual void notifyAuthReceived(BlackBerry::Platform::NetworkRequest::AuthType, const char* realm, bool success, bool requireCredentials);
+    virtual void notifyAuthReceived(BlackBerry::Platform::NetworkRequest::AuthType, const char* realm, AuthResult, bool requireCredentials);
     // notifyStringHeaderReceived exists only to resolve ambiguity between char* and String parameters
     void notifyStringHeaderReceived(const String& key, const String& value);