Changeset 160836 in webkit

Timestamp:

Dec 19, 2013 9:32:49 AM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/15696824> [CFNetwork] Loading stops at server redirects
​https://bugs.webkit.org/show_bug.cgi?id=125984

Reviewed by Anders Carlsson.

• platform/network/cf/ResourceHandleCFNet.cpp:

(WebCore::ResourceHandle::willSendRequest): If the client uses async callbacks, call its
willSendRequestAsync callback instead if willSendRequest.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-19  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/15696824> [CFNetwork] Loading stops at server redirects
+        https://bugs.webkit.org/show_bug.cgi?id=125984
+
+        Reviewed by Anders Carlsson.
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::willSendRequest): If the client uses async callbacks, call its
+        willSendRequestAsync callback instead if willSendRequest.
+
 2013-12-19  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -280 +280 @@
 
     Ref<ResourceHandle> protect(*this);
-    client()->willSendRequest(this, request, redirectResponse);
-
-    // Client call may not preserve the session, especially if the request is sent over IPC.
-    if (!request.isNull()) {
-        request.setStorageSession(d->m_storageSession.get());
-
-        d->m_currentRequest = request;
+    if (client()->usesAsyncCallbacks())
+        client()->willSendRequestAsync(this, request, redirectResponse);
+    else {
+        client()->willSendRequest(this, request, redirectResponse);
+
+        // Client call may not preserve the session, especially if the request is sent over IPC.
+        if (!request.isNull()) {
+            request.setStorageSession(d->m_storageSession.get());
+
+            d->m_currentRequest = request;
+        }
     }
 }