Title: [234587] trunk
Revision
234587
Author
[email protected]
Date
2018-08-05 23:43:51 -0700 (Sun, 05 Aug 2018)

Log Message

[GTK][WPE] Fetch tests assert in SubresourceLoader::didReceiveResponse()
https://bugs.webkit.org/show_bug.cgi?id=188163

Patch by Rob Buis <[email protected]> on 2018-08-05
Reviewed by Frédéric Wang.

Source/WebCore:

Fetch in manual redirect mode uses didReceiveResponse instead of
willSendRequestInternal, so update the ASSERT.

* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didReceiveResponse):

LayoutTests:

Unskip since this will not crash in Debug anymore.

* platform/wpe/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (234586 => 234587)


--- trunk/LayoutTests/ChangeLog	2018-08-06 04:37:10 UTC (rev 234586)
+++ trunk/LayoutTests/ChangeLog	2018-08-06 06:43:51 UTC (rev 234587)
@@ -1,3 +1,14 @@
+2018-08-05  Rob Buis  <[email protected]>
+
+        [GTK][WPE] Fetch tests assert in SubresourceLoader::didReceiveResponse()
+        https://bugs.webkit.org/show_bug.cgi?id=188163
+
+        Reviewed by Frédéric Wang.
+
+        Unskip since this will not crash in Debug anymore.
+
+        * platform/wpe/TestExpectations:
+
 2018-08-05  Yusuke Suzuki  <[email protected]>
 
         Add support for microtasks in workers

Modified: trunk/LayoutTests/platform/wpe/TestExpectations (234586 => 234587)


--- trunk/LayoutTests/platform/wpe/TestExpectations	2018-08-06 04:37:10 UTC (rev 234586)
+++ trunk/LayoutTests/platform/wpe/TestExpectations	2018-08-06 06:43:51 UTC (rev 234587)
@@ -1328,10 +1328,3 @@
 
 webkit.org/b/188162 [ Debug ] fast/canvas/webgl/texImage2D-video-flipY-false.html [ Crash ]
 webkit.org/b/188162 [ Debug ] fast/canvas/webgl/texImage2D-video-flipY-true.html [ Crash ]
-
-webkit.org/b/188163 [ Debug ] http/tests/fetch/caching-with-different-options.html [ Crash ]
-webkit.org/b/188163 [ Debug ] http/tests/fetch/redirectmode-and-preload.html [ Crash ]
-webkit.org/b/188163 [ Debug ] imported/w3c/web-platform-tests/fetch/api/redirect/redirect-location-worker.html [ Crash ]
-webkit.org/b/188163 [ Debug ] imported/w3c/web-platform-tests/fetch/api/redirect/redirect-location.html [ Crash ]
-webkit.org/b/188163 [ Debug ] imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode-worker.html [ Crash ]
-webkit.org/b/188163 [ Debug ] imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html[ Crash ]

Modified: trunk/Source/WebCore/ChangeLog (234586 => 234587)


--- trunk/Source/WebCore/ChangeLog	2018-08-06 04:37:10 UTC (rev 234586)
+++ trunk/Source/WebCore/ChangeLog	2018-08-06 06:43:51 UTC (rev 234587)
@@ -1,3 +1,16 @@
+2018-08-05  Rob Buis  <[email protected]>
+
+        [GTK][WPE] Fetch tests assert in SubresourceLoader::didReceiveResponse()
+        https://bugs.webkit.org/show_bug.cgi?id=188163
+
+        Reviewed by Frédéric Wang.
+
+        Fetch in manual redirect mode uses didReceiveResponse instead of
+        willSendRequestInternal, so update the ASSERT.
+
+        * loader/SubresourceLoader.cpp:
+        (WebCore::SubresourceLoader::didReceiveResponse):
+
 2018-08-05  Yusuke Suzuki  <[email protected]>
 
         Add support for microtasks in workers

Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (234586 => 234587)


--- trunk/Source/WebCore/loader/SubresourceLoader.cpp	2018-08-06 04:37:10 UTC (rev 234586)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp	2018-08-06 06:43:51 UTC (rev 234587)
@@ -318,11 +318,11 @@
     }
 #endif
 
-    // We want redirect responses to be processed through willSendRequestInternal.
-    // The only exception is redirection with no Location headers. Or in rare circumstances,
+    // We want redirect responses to be processed through willSendRequestInternal. Exceptions are
+    // redirection with no Location headers and fetch in manual redirect mode. Or in rare circumstances,
     // cases of too many redirects from CFNetwork (<rdar://problem/30610988>).
 #if !PLATFORM(COCOA)
-    ASSERT(response.httpStatusCode() < 300 || response.httpStatusCode() >= 400 || response.httpStatusCode() == 304 || !response.httpHeaderField(HTTPHeaderName::Location));
+    ASSERT(response.httpStatusCode() < 300 || response.httpStatusCode() >= 400 || response.httpStatusCode() == 304 || !response.httpHeaderField(HTTPHeaderName::Location) || response.type() == ResourceResponse::Type::Opaqueredirect);
 #endif
 
     // Reference the object in this method since the additional processing can do
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to