Attachment 361873 Details for Bug 191652 – Patch

[patch] Patch

bug-191652-20190213102941.patch (text/plain), 2.61 KB, created by Takashi Komori on 2019-02-12 17:32:33 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Komori

Created: 2019-02-12 17:32:33 PST

Size: 2.61 KB

patch

obsolete

>Subversion Revision: 241183
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index a8280858f28ae3c63a1ae987f8b53c2a08231b5a..02d1162a0208ada1c99f08944ed14da77925f90f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2019-02-12  Takashi Komori  <Takashi.Komori@sony.com>
>+
>+        [Curl] Load HTTP body of 401 response when AuthenticationChange is cancelled.
>+        https://bugs.webkit.org/show_bug.cgi?id=191652
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
>+        (WebKit::NetworkDataTaskCurl::tryHttpAuthentication):
>+        (WebKit::NetworkDataTaskCurl::tryProxyAuthentication):
>+
> 2019-02-07  Chris Dumez  <cdumez@apple.com>
> 
>         Mark more heap-allocated classes as fast allocated
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>index 5610bef365c2bfce9bc0bc1f0f3dac340abec2da..3dd8df00e9ad62504a8eee039f200cfb38e08fce 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>@@ -365,12 +365,6 @@ void NetworkDataTaskCurl::tryHttpAuthentication(AuthenticationChallenge&& challe
>         if (m_state == State::Canceling || m_state == State::Completed)
>             return;
> 
>-        if (disposition == AuthenticationChallengeDisposition::Cancel) {
>-            cancel();
>-            m_client->didCompleteWithError(ResourceError::httpError(CURLE_COULDNT_RESOLVE_HOST, m_response.url()));
>-            return;
>-        }
>-
>         if (disposition == AuthenticationChallengeDisposition::UseCredential && (!credential.isEmpty() || !m_didChallengeEmptyCredentialForAuth)) {
>             // When "isAllowedToAskUserForCredentials" is false, an empty credential, which might cause
>             // an infinite authentication loop. To avoid such infinite loop, a HTTP authentication with empty
>@@ -397,12 +391,6 @@ void NetworkDataTaskCurl::tryProxyAuthentication(WebCore::AuthenticationChalleng
>         if (m_state == State::Canceling || m_state == State::Completed)
>             return;
> 
>-        if (disposition == AuthenticationChallengeDisposition::Cancel) {
>-            cancel();
>-            m_client->didCompleteWithError(ResourceError::httpError(CURLE_COULDNT_RESOLVE_PROXY, m_response.url()));
>-            return;
>-        }
>-
>         if (disposition == AuthenticationChallengeDisposition::UseCredential && (!credential.isEmpty() || !m_didChallengeEmptyCredentialForProxyAuth)) {
>             if (credential.isEmpty())
>                 m_didChallengeEmptyCredentialForProxyAuth = true;

Actions: View | Formatted Diff | Diff

Attachments on bug 191652: 361772 | 361780 | 361873 | 362976