Title: [160836] trunk/Source/WebCore
- Revision
- 160836
- Author
- [email protected]
- Date
- 2013-12-19 09:32:49 -0800 (Thu, 19 Dec 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160835 => 160836)
--- trunk/Source/WebCore/ChangeLog 2013-12-19 17:22:19 UTC (rev 160835)
+++ trunk/Source/WebCore/ChangeLog 2013-12-19 17:32:49 UTC (rev 160836)
@@ -1,3 +1,14 @@
+2013-12-19 Dan Bernstein <[email protected]>
+
+ <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 <[email protected]>
CascadedProperties: Deferred properties should have inline capacity.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (160835 => 160836)
--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2013-12-19 17:22:19 UTC (rev 160835)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2013-12-19 17:32:49 UTC (rev 160836)
@@ -279,13 +279,17 @@
}
Ref<ResourceHandle> protect(*this);
- client()->willSendRequest(this, request, redirectResponse);
+ 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());
+ // 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;
+ d->m_currentRequest = request;
+ }
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
