Changeset 290497 in webkit

Timestamp:

Feb 25, 2022, 12:16:21 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r290338 - PingLoader is failing to call completion handler in error case
​https://bugs.webkit.org/show_bug.cgi?id=237062
<rdar://50157253>

Reviewed by Chris Dumez.

The completion handler was not being called in the case of a PingLoad being redirected to
a non-HTTP(S) scheme.

• NetworkProcess/PingLoad.cpp:

(WebKit::PingLoad::willPerformHTTPRedirection):

Location:

releases/WebKitGTK/webkit-2.36/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/PingLoad.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-22  Brent Fulgham  <bfulgham@apple.com>
+
+        PingLoader is failing to call completion handler in error case
+        https://bugs.webkit.org/show_bug.cgi?id=237062
+        <rdar://50157253>
+
+        Reviewed by Chris Dumez.
+
+        The completion handler was not being called in the case of a PingLoad being redirected to
+        a non-HTTP(S) scheme.
+
+        * NetworkProcess/PingLoad.cpp:
+        (WebKit::PingLoad::willPerformHTTPRedirection):
+
 2022-02-23  Maxim Cournoyer  <maxim.cournoyer@gmail.com>
 

releases/WebKitGTK/webkit-2.36/Source/WebKit/NetworkProcess/PingLoad.cpp

@@ -135 +135 @@
     m_networkLoadChecker->checkRedirection(ResourceRequest { }, WTFMove(request), WTFMove(redirectResponse), nullptr, [this, completionHandler = WTFMove(completionHandler)] (auto&& result) mutable {
         if (!result.has_value()) {
+            this->didFinish(result.error());
             completionHandler({ });
-            this->didFinish(result.error());
             return;
         }
@@ -142 +142 @@
         if (!request.url().protocolIsInHTTPFamily()) {
             this->didFinish(ResourceError { String { }, 0, request.url(), "Redirection to URL with a scheme that is not HTTP(S)"_s, ResourceError::Type::AccessControl });
+            completionHandler({ });
             return;
         }