Title: [221347] releases/WebKitGTK/webkit-2.18/Source/WebKit
Revision
221347
Author
carlo...@webkit.org
Date
2017-08-30 00:58:49 -0700 (Wed, 30 Aug 2017)

Log Message

Merge r221081 - Regression(r221059): NetworkDataTask::didReceiveResponse() should not use PolicyUse for HTTP/0.9
https://bugs.webkit.org/show_bug.cgi?id=175872

Reviewed by Daniel Bates.

r221059 was calling the ResponseCompletionHandler with {} which ended up being
PolicyUse. Since this is an error case and do not want to receive the data, it
makes more sense to use PolicyIgnore instead. There should not be a behavior
change on WebKit side though since we are cancelling the load right after
calling the completion handler anyway.

Tests under http/tests/security/http-0.9/ are still passing.

* NetworkProcess/NetworkDataTask.cpp:
(WebKit::NetworkDataTask::didReceiveResponse):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (221346 => 221347)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-08-30 07:58:39 UTC (rev 221346)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog	2017-08-30 07:58:49 UTC (rev 221347)
@@ -1,3 +1,21 @@
+2017-08-23  Chris Dumez  <cdu...@apple.com>
+
+        Regression(r221059): NetworkDataTask::didReceiveResponse() should not use PolicyUse for HTTP/0.9
+        https://bugs.webkit.org/show_bug.cgi?id=175872
+
+        Reviewed by Daniel Bates.
+
+        r221059 was calling the ResponseCompletionHandler with {} which ended up being
+        PolicyUse. Since this is an error case and do not want to receive the data, it
+        makes more sense to use PolicyIgnore instead. There should not be a behavior
+        change on WebKit side though since we are cancelling the load right after
+        calling the completion handler anyway.
+
+        Tests under http/tests/security/http-0.9/ are still passing.
+
+        * NetworkProcess/NetworkDataTask.cpp:
+        (WebKit::NetworkDataTask::didReceiveResponse):
+
 2017-08-22  Chris Dumez  <cdu...@apple.com>
 
         Introduce a new CompletionHandler type and use it for NetworkDataTaskClient's completion handlers to help catch bugs

Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkDataTask.cpp (221346 => 221347)


--- releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkDataTask.cpp	2017-08-30 07:58:39 UTC (rev 221346)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/NetworkProcess/NetworkDataTask.cpp	2017-08-30 07:58:49 UTC (rev 221347)
@@ -103,7 +103,7 @@
         auto url = ""
         std::optional<uint16_t> port = url.port();
         if (port && !isDefaultPortForProtocol(port.value(), url.protocol())) {
-            completionHandler({ });
+            completionHandler(PolicyIgnore);
             cancel();
             m_client->didCompleteWithError({ String(), 0, url, "Cancelled load from '" + url.stringCenterEllipsizedToLength() + "' because it is using HTTP/0.9." });
             return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to