Changeset 122692 in webkit

Timestamp:

Jul 15, 2012 7:53:19 PM (12 years ago)

Author:

jason.liu@torchmobile.com.cn

Message:

[BlackBerry] We shouldn't call didFinishLoading for the old request when a new request has been sent by notifyAuthReceived.
​https://bugs.webkit.org/show_bug.cgi?id=90962

Reviewed by Rob Buis.

We start a new NetworkJob with credentials after receiving 401/407 status.
We should not release resources in webcore when the old job is closed because
they are needed by the new one.
We should do as 3XX.

No new tests. No change in behaviour.

• platform/network/blackberry/NetworkJob.cpp:

(WebCore::NetworkJob::NetworkJob):
(WebCore::NetworkJob::notifyAuthReceived):
(WebCore::NetworkJob::shouldReleaseClientResource):
(WebCore::NetworkJob::handleRedirect):

• platform/network/blackberry/NetworkJob.h:

(NetworkJob):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-15  Jason Liu  <jason.liu@torchmobile.com.cn>
+
+        [BlackBerry] We shouldn't call didFinishLoading for the old request when a new request has been sent by notifyAuthReceived.
+        https://bugs.webkit.org/show_bug.cgi?id=90962
+
+        Reviewed by Rob Buis.
+
+        We start a new NetworkJob with credentials after receiving 401/407 status.
+        We should not release resources in webcore when the old job is closed because
+        they are needed by the new one.
+        We should do as 3XX.
+
+        No new tests. No change in behaviour.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::NetworkJob):
+        (WebCore::NetworkJob::notifyAuthReceived):
+        (WebCore::NetworkJob::shouldReleaseClientResource):
+        (WebCore::NetworkJob::handleRedirect):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+
 2012-07-15  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -84 +84 @@
     , m_needsRetryAsFTPDirectory(false)
     , m_isOverrideContentType(false)
+    , m_newJobWithCredentialsStarted(false)
     , m_extendedStatusCode(0)
     , m_redirectCount(0)
@@ -283 +284 @@
     }
 
-    sendRequestWithCredentials(serverType, scheme, realm);
+    m_newJobWithCredentialsStarted = sendRequestWithCredentials(serverType, scheme, realm);
 }
 
@@ -506 +507 @@
 bool NetworkJob::shouldReleaseClientResource()
 {
-    if (m_redirectCount >= s_redirectMaximum)
-        return true;
-
-    if (m_needsRetryAsFTPDirectory && retryAsFTPDirectory())
+    if ((m_needsRetryAsFTPDirectory && retryAsFTPDirectory()) || (isRedirect(m_extendedStatusCode) && handleRedirect()) || m_newJobWithCredentialsStarted)
         return false;
-
-    if (isRedirect(m_extendedStatusCode) && handleRedirect())
-        return false;
-
     return true;
 }
@@ -577 +571 @@
 {
     ASSERT(m_handle);
-    if (!m_handle)
+    if (!m_handle || m_redirectCount >= s_redirectMaximum)
         return false;
 

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

@@ -166 +166 @@
     bool m_needsRetryAsFTPDirectory;
     bool m_isOverrideContentType;
+    bool m_newJobWithCredentialsStarted;
 
     // If an HTTP status code is received, m_extendedStatusCode and m_response.httpStatusCode will both be set to it.