Title: [220348] branches/safari-604.1-branch/Source/WebKit
- Revision
- 220348
- Author
- matthew_han...@apple.com
- Date
- 2017-08-07 11:55:59 -0700 (Mon, 07 Aug 2017)
Log Message
Cherry-pick r220273. rdar://problem/33732754
Modified Paths
Diff
Modified: branches/safari-604.1-branch/Source/WebKit/ChangeLog (220347 => 220348)
--- branches/safari-604.1-branch/Source/WebKit/ChangeLog 2017-08-07 18:55:56 UTC (rev 220347)
+++ branches/safari-604.1-branch/Source/WebKit/ChangeLog 2017-08-07 18:55:59 UTC (rev 220348)
@@ -1,3 +1,21 @@
+2017-08-07 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r220273. rdar://problem/33732754
+
+ 2017-08-04 Andreas Kling <akl...@apple.com>
+
+ NetworkLoad should always invoke its redirect completion handler
+ https://bugs.webkit.org/show_bug.cgi?id=175179
+ <rdar://problem/33464999>
+
+ Reviewed by Chris Dumez.
+
+ Make sure the redirect completion handler is always invoked,
+ just like we already did for the response completion handler.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::~NetworkLoad):
+
2017-08-04 Jason Marcell <jmarc...@apple.com>
Revert r219896. rdar://problem/33711000
Modified: branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp (220347 => 220348)
--- branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2017-08-07 18:55:56 UTC (rev 220347)
+++ branches/safari-604.1-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2017-08-07 18:55:59 UTC (rev 220348)
@@ -135,6 +135,8 @@
#if USE(NETWORK_SESSION)
if (m_responseCompletionHandler)
m_responseCompletionHandler(PolicyIgnore);
+ if (m_redirectCompletionHandler)
+ m_redirectCompletionHandler({ });
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
if (m_challengeCompletionHandler)
m_challengeCompletionHandler(AuthenticationChallengeDisposition::Cancel, { });
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
