Diff
Modified: trunk/LayoutTests/ChangeLog (221803 => 221804)
--- trunk/LayoutTests/ChangeLog 2017-09-09 00:10:45 UTC (rev 221803)
+++ trunk/LayoutTests/ChangeLog 2017-09-09 00:33:44 UTC (rev 221804)
@@ -1,3 +1,22 @@
+2017-09-08 Joseph Pecoraro <[email protected]>
+
+ Fetch's Response.statusText is unexpectedly the full http status line for HTTP/2 responses
+ https://bugs.webkit.org/show_bug.cgi?id=176479
+
+ Reviewed by Alex Christensen.
+
+ * http/wpt/fetch/resources/status-garbage.asis: Added.
+ * http/wpt/fetch/resources/status-normal.txt: Added.
+ * http/wpt/fetch/resources/status-with-message.asis: Added.
+ * http/wpt/fetch/resources/status-without-message.asis: Added.
+ Various text HTTP responses with different status lines.
+
+ * http/wpt/fetch/response-status-text-expected.txt: Added.
+ * http/wpt/fetch/response-status-text.html: Added.
+ Test the Fetch Response's status / statusText for different HTTP status lines.
+ The status without a message is similiar to HTTP/2 because HTTP/2 only
+ has a :status pseudo-header and lacks a reason phrase.
+
2017-09-08 Said Abou-Hallawa <[email protected]>
Implement the attribute HTMLImageElement.async
Added: trunk/LayoutTests/http/wpt/fetch/resources/status-garbage.asis (0 => 221804)
--- trunk/LayoutTests/http/wpt/fetch/resources/status-garbage.asis (rev 0)
+++ trunk/LayoutTests/http/wpt/fetch/resources/status-garbage.asis 2017-09-09 00:33:44 UTC (rev 221804)
@@ -0,0 +1 @@
+ALPHA BETA
Added: trunk/LayoutTests/http/wpt/fetch/resources/status-normal.txt (0 => 221804)
--- trunk/LayoutTests/http/wpt/fetch/resources/status-normal.txt (rev 0)
+++ trunk/LayoutTests/http/wpt/fetch/resources/status-normal.txt 2017-09-09 00:33:44 UTC (rev 221804)
@@ -0,0 +1 @@
+Intentionally empty.
Added: trunk/LayoutTests/http/wpt/fetch/resources/status-with-message.asis (0 => 221804)
--- trunk/LayoutTests/http/wpt/fetch/resources/status-with-message.asis (rev 0)
+++ trunk/LayoutTests/http/wpt/fetch/resources/status-with-message.asis 2017-09-09 00:33:44 UTC (rev 221804)
@@ -0,0 +1 @@
+HTTP/1.1 200 Alpha
Added: trunk/LayoutTests/http/wpt/fetch/resources/status-without-message.asis (0 => 221804)
--- trunk/LayoutTests/http/wpt/fetch/resources/status-without-message.asis (rev 0)
+++ trunk/LayoutTests/http/wpt/fetch/resources/status-without-message.asis 2017-09-09 00:33:44 UTC (rev 221804)
@@ -0,0 +1 @@
+HTTP/1.1 200
Added: trunk/LayoutTests/http/wpt/fetch/response-status-text-expected.txt (0 => 221804)
--- trunk/LayoutTests/http/wpt/fetch/response-status-text-expected.txt (rev 0)
+++ trunk/LayoutTests/http/wpt/fetch/response-status-text-expected.txt 2017-09-09 00:33:44 UTC (rev 221804)
@@ -0,0 +1,6 @@
+
+PASS Normal status text.
+PASS Abnormal status text.
+PASS Empty status text.
+PASS Garbage status line.
+
Added: trunk/LayoutTests/http/wpt/fetch/response-status-text.html (0 => 221804)
--- trunk/LayoutTests/http/wpt/fetch/response-status-text.html (rev 0)
+++ trunk/LayoutTests/http/wpt/fetch/response-status-text.html 2017-09-09 00:33:44 UTC (rev 221804)
@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>Response status and statusText given various HTTP response status lines.</title>
+ <script src=""
+ <script src=""
+</head>
+<body>
+<script>
+promise_test(test => {
+ return fetch("resources/status-normal.txt").then((response) => {
+ assert_equals(response.status, 200);
+ assert_equals(response.statusText, "OK");
+ });
+}, "Normal status text.");
+
+promise_test(test => {
+ return fetch("resources/status-with-message.asis").then((response) => {
+ assert_equals(response.status, 200);
+ assert_equals(response.statusText, "Alpha");
+ });
+}, "Abnormal status text.");
+
+promise_test(test => {
+ return fetch("resources/status-without-message.asis").then((response) => {
+ assert_equals(response.status, 200);
+ assert_equals(response.statusText, "");
+ });
+}, "Empty status text.");
+
+promise_test(test => {
+ let promise = fetch("resources/status-garbage.asis");
+ return promise_rejects(test, new TypeError(), promise);
+}, "Garbage status line.");
+</script>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (221803 => 221804)
--- trunk/Source/WebCore/ChangeLog 2017-09-09 00:10:45 UTC (rev 221803)
+++ trunk/Source/WebCore/ChangeLog 2017-09-09 00:33:44 UTC (rev 221804)
@@ -1,3 +1,19 @@
+2017-09-08 Joseph Pecoraro <[email protected]>
+
+ Fetch's Response.statusText is unexpectedly the full http status line for HTTP/2 responses
+ https://bugs.webkit.org/show_bug.cgi?id=176479
+
+ Reviewed by Alex Christensen.
+
+ Test: http/wpt/fetch/response-status-text.html
+
+ HTTP/2 doesn't include a status reason phrase. So the "status line"
+ ends up just being the version and status code. Fallback to the empty
+ string instead of the full line.
+
+ * platform/network/HTTPParsers.cpp:
+ (WebCore::extractReasonPhraseFromHTTPStatusLine):
+
2017-09-08 Said Abou-Hallawa <[email protected]>
Implement the attribute HTMLImageElement.async
Modified: trunk/Source/WebCore/platform/network/HTTPParsers.cpp (221803 => 221804)
--- trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2017-09-09 00:10:45 UTC (rev 221803)
+++ trunk/Source/WebCore/platform/network/HTTPParsers.cpp 2017-09-09 00:33:44 UTC (rev 221804)
@@ -478,12 +478,18 @@
return ContentTypeOptionsNone;
}
+// For example: "HTTP/1.1 200 OK" => "OK".
+// Note that HTTP/2 does not include a reason phrase, so we return the empty atom.
AtomicString extractReasonPhraseFromHTTPStatusLine(const String& statusLine)
{
StringView view = statusLine;
size_t spacePos = view.find(' ');
+
// Remove status code from the status line.
spacePos = view.find(' ', spacePos + 1);
+ if (spacePos == notFound)
+ return emptyAtom();
+
return view.substring(spacePos + 1).toAtomicString();
}
Modified: trunk/Source/WebKit/ChangeLog (221803 => 221804)
--- trunk/Source/WebKit/ChangeLog 2017-09-09 00:10:45 UTC (rev 221803)
+++ trunk/Source/WebKit/ChangeLog 2017-09-09 00:33:44 UTC (rev 221804)
@@ -1,3 +1,14 @@
+2017-09-08 Joseph Pecoraro <[email protected]>
+
+ Fetch's Response.statusText is unexpectedly the full http status line for HTTP/2 responses
+ https://bugs.webkit.org/show_bug.cgi?id=176479
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ Initialize AtomicString statics like emptyAtom().
+
2017-09-08 Commit Queue <[email protected]>
Unreviewed, rolling out r221773.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (221803 => 221804)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2017-09-09 00:10:45 UTC (rev 221803)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2017-09-09 00:33:44 UTC (rev 221804)
@@ -66,6 +66,7 @@
#include <pal/SessionID.h>
#include <wtf/OptionSet.h>
#include <wtf/RunLoop.h>
+#include <wtf/text/AtomicString.h>
#include <wtf/text/CString.h>
#if ENABLE(SEC_ITEM_SHIM)
@@ -207,6 +208,7 @@
platformInitializeNetworkProcess(parameters);
WTF::Thread::setCurrentThreadIsUserInitiated();
+ AtomicString::init();
m_suppressMemoryPressureHandler = parameters.shouldSuppressMemoryPressureHandler;
m_loadThrottleLatency = parameters.loadThrottleLatency;
