Attachment 346514 Details for Bug 188163 – Patch

[patch] Patch

bug-188163-20180803211406.patch (text/plain), 4.06 KB, created by Rob Buis on 2018-08-03 12:14:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2018-08-03 12:14:07 PDT

Size: 4.06 KB

patch

obsolete

>Subversion Revision: 234544
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 11ff0f572c837655993468f02d4e46f0d4f5d651..fd0185e5a481285fcf7ee047a4a8fcb11349b182 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-03  Rob Buis  <rbuis@igalia.com>
>+
>+        [GTK][WPE] Fetch tests assert in SubresourceLoader::didReceiveResponse()
>+        https://bugs.webkit.org/show_bug.cgi?id=188163
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fetch in manual redirect mode uses didReceiveResponse instead of
>+        willSendRequestInternal, so update the ASSERT.
>+
>+        * loader/SubresourceLoader.cpp:
>+        (WebCore::SubresourceLoader::didReceiveResponse):
>+
> 2018-08-03  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Do not check margin box while validating geometry.
>diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp
>index 2cf70fa44f6625cfc17eb20b84391af60fd522e5..9a4dd30ee8e664ab251a11df06cfd864b0a1c118 100644
>--- a/Source/WebCore/loader/SubresourceLoader.cpp
>+++ b/Source/WebCore/loader/SubresourceLoader.cpp
>@@ -318,11 +318,11 @@ void SubresourceLoader::didReceiveResponse(const ResourceResponse& response, Com
>     }
> #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
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index fea830e6f1668b1557654c43af5bcc608598c332..4d771dd0b598f9b49339dbbfa2d9259003a840bd 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-03  Rob Buis  <rbuis@igalia.com>
>+
>+        [GTK][WPE] Fetch tests assert in SubresourceLoader::didReceiveResponse()
>+        https://bugs.webkit.org/show_bug.cgi?id=188163
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Unskip since this will not crash in Debug anymore.
>+
>+        * platform/wpe/TestExpectations:
>+
> 2018-08-02  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Release assert when throwing exceptions in custom element reactions
>diff --git a/LayoutTests/platform/wpe/TestExpectations b/LayoutTests/platform/wpe/TestExpectations
>index ded26975834340c89f2306eb031795461597f173..32ccf7ac8a732cee0cb9487414d7719bf7031eb4 100644
>--- a/LayoutTests/platform/wpe/TestExpectations
>+++ b/LayoutTests/platform/wpe/TestExpectations
>@@ -1328,10 +1328,3 @@ webkit.org/b/188161 [ Debug ] webgl/1.0.2/conformance/context/context-lost-resto
> 
> 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 ]

Actions: View | Formatted Diff | Diff

Attachments on bug 188163: 346494 | 346514