Attachment 345980 Details for Bug 188130 – PATCH

[patch] PATCH

188130.diff (text/plain), 2.92 KB, created by Basuke Suzuki on 2018-07-27 17:36:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Basuke Suzuki

Created: 2018-07-27 17:36:17 PDT

Size: 2.92 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index d7be204be1b..c06095aa05e 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Fix the bug when client reject the redirect on WebKitLegacy.
>+        https://bugs.webkit.org/show_bug.cgi?id=188130
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/wincairo/TestExpectations:
>+        - xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt: Pass
>+
> 2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
> 
>         [Curl] Crash on synchronous request via ResourceHandle.
>diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations
>index a74c02d8baa..94a0c33f748 100644
>--- a/LayoutTests/platform/wincairo/TestExpectations
>+++ b/LayoutTests/platform/wincairo/TestExpectations
>@@ -929,7 +929,7 @@ http/tests/workers [ Skip ]
> 
> http/tests/xmlhttprequest [ Skip ]
> http/tests/xmlhttprequest/simple-sync.html [ Pass ]
>-http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect.html [ Failure ]
>+http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect.html [ Pass ]
> 
> http/tests/xmlviewer [ Skip ]
> http/tests/xsl [ Skip ]
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 81736d8728b..57568668a26 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-07-27  Basuke Suzuki  <Basuke.Suzuki@sony.com>
>+
>+        [Curl] Fix the bug when client reject the redirect on WebKitLegacy.
>+        https://bugs.webkit.org/show_bug.cgi?id=188130
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        ResourceHandle for Curl port has a bug when a client returns en empty request which
>+        indicates the redirecti is rejected by the client. It should be quit the task immediately,
>+        but it kept doing the job. Fixed.
>+        NetworkDataTask implementation did the right thing and there's no bug for them. 
>+
>+        Test: http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt
>+
>+        * platform/network/curl/ResourceHandleCurl.cpp:
>+        (WebCore::ResourceHandle::continueAfterWillSendRequest):
>+
> 2018-07-27  Myles C. Maxfield  <mmaxfield@apple.com>
> 
>         [WIN] Crash when trying to access store pages
>diff --git a/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp b/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
>index 55592cb7360..641fe1b4fdb 100644
>--- a/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
>+++ b/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
>@@ -496,7 +496,7 @@ void ResourceHandle::continueAfterWillSendRequest(ResourceRequest&& request)
>     ASSERT(isMainThread());
> 
>     // willSendRequest might cancel the load.
>-    if (cancelledOrClientless() || !d->m_curlRequest)
>+    if (cancelledOrClientless() || !d->m_curlRequest || request.isNull())
>         return;
> 
>     auto wasSyncRequest = d->m_curlRequest->isSyncRequest();

Flags:

darin: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188130: 345977 | 345980 | 345997 | 346031