Changeset 186559 in webkit

Timestamp:

Jul 8, 2015, 6:03:51 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r183861. rdar://problem/21716677

Location:

branches/safari-600.1.4.17-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (3 diffs)
• Shared/Authentication/AuthenticationManager.cpp (modified) (5 diffs)

branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-07-08  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r183861. rdar://problem/21716677
+
+    2015-05-05  Alexey Proskuryakov  <ap@apple.com>
+
+            NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.
+            https://bugs.webkit.org/show_bug.cgi?id=144641
+            rdar://problem/20250960
+
+            Reviewed by David Kilzer.
+
+            * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):
+            Clear the client pointer.
+
+            * Shared/Authentication/AuthenticationManager.cpp:
+            (WebKit::AuthenticationManager::useCredentialForChallenge):
+            (WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
+            (WebKit::AuthenticationManager::cancelChallenge):
+            (WebKit::AuthenticationManager::performDefaultHandling):
+            (WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):
+            Updated comments, which were not accurate, at least on Mac.
+
 2015-07-08  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.1.4.17-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -99 +99 @@
 
     ASSERT(RunLoop::isMain());
-    
+
     if (reply || parameters.shouldBufferResource)
         m_bufferedData = WebCore::SharedBuffer::create();
@@ -162 +162 @@
     // Tell the scheduler about this finished loader soon so it can start more network requests.
     NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);
-
     if (m_handle) {
-        // Explicit deref() balanced by a ref() in NetworkResourceLoader::start()
-        // This might cause the NetworkResourceLoader to be destroyed and therefore we do it last.
-        m_handle = 0;
-        deref();
+        m_handle->setClient(nullptr);
+        m_handle = nullptr;
     }
 }
@@ -216 +213 @@
     // FIXME (NetworkProcess): For the memory cache we'll also need to cache the response data here.
     // Such buffering will need to be thread safe, as this callback is happening on a background thread.
-    
+
     m_bytesReceived += buffer->size();
     if (m_bufferedData)

branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp

@@ -117 +117 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedCredential(challenge, credential);
         return;
@@ -133 +134 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedRequestToContinueWithoutCredential(challenge);
         return;
@@ -149 +151 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedCancellation(challenge);
         return;
@@ -165 +168 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedRequestToPerformDefaultHandling(challenge);
         return;
@@ -181 +185 @@
     AuthenticationClient* coreClient = challenge.authenticationClient();
     if (!coreClient) {
-        // This authentication challenge comes from a download.
+        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+        // We should not call Download::receivedCredential in the latter case.
         Download::receivedChallengeRejection(challenge);
         return;