From 74c1042fbe21a44ab287c67134afb76012587f2f Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Wed, 11 Apr 2018 15:03:14 +0200
Subject: [PATCH 1/2] XMLHttpRequest: response header value containing 0x00

As discussed in https://github.com/whatwg/xhr/issues/165 these should turn the response into a network error.
---
 xhr/headers-normalize-response.htm | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/xhr/headers-normalize-response.htm b/xhr/headers-normalize-response.htm
index 466b0d977cc6cd..55a7238943abec 100644
--- a/xhr/headers-normalize-response.htm
+++ b/xhr/headers-normalize-response.htm
@@ -3,13 +3,15 @@
 <title>Whitespace and null in header values</title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src=support.js?pipe=sub></script>
-
-<h1>Whitespace and null in response header values</h1>
-
 <div id=log></div>
-
 <script>
+function error(val) {
+  test(() => {
+    const client = new XMLHttpRequest();
+    client.open("GET", "resources/parse-headers.py?my-custom-header="+encodeURIComponent(val), false);
+    assert_throws("NetworkError", () => client.send());
+  }, "Header value: " + val.replace("\0", "\\0"));
+}
 
 function matchHeaderValue(val) {
     test(function () {
@@ -20,12 +22,12 @@ <h1>Whitespace and null in response header values</h1>
         var r = client.getResponseHeader("My-Custom-Header");
 
         assert_equals(r, trimmed);
-    }, "Header value: " + val.replace(/\t/g, "[tab]").replace(/ /g, "_").replace("\0", "\\0"));
+    }, "Header value: " + val.replace(/\t/g, "[tab]").replace(/ /g, "_"));
 }
 
-matchHeaderValue("hello world\0");
-matchHeaderValue("\0hello world");
-matchHeaderValue("hello\0world");
+error("hello world\0");
+error("\0hello world");
+error("hello\0world");
 matchHeaderValue("  hello world");
 matchHeaderValue("hello world  ");
 matchHeaderValue("  hello world  ");
@@ -34,9 +36,12 @@ <h1>Whitespace and null in response header values</h1>
 matchHeaderValue("\thello world\t");
 matchHeaderValue("hello      world");
 matchHeaderValue("hello\tworld");
-matchHeaderValue("\0");
+error("\0");
 matchHeaderValue("   ");
 matchHeaderValue("\t");
 matchHeaderValue("");
 
+promise_test(t => {
+  return promise_rejects(t, new TypeError(), fetch("resources/parse-headers.py?my-custom-header="+encodeURIComponent("x\0x")));
+}, "Ensure fetch() rejects too")
 </script>

From e5088a4864c9cf7dbd3b81c6886ad787a2e4741b Mon Sep 17 00:00:00 2001
From: Anne van Kesteren <annevk@annevk.nl>
Date: Fri, 24 Aug 2018 16:39:51 +0200
Subject: [PATCH 2/2] address nit

---
 fetch/api/basic/header-value-null-byte.any.js | 5 +++++
 xhr/headers-normalize-response.htm            | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 fetch/api/basic/header-value-null-byte.any.js

diff --git a/fetch/api/basic/header-value-null-byte.any.js b/fetch/api/basic/header-value-null-byte.any.js
new file mode 100644
index 00000000000000..9c223740c7807b
--- /dev/null
+++ b/fetch/api/basic/header-value-null-byte.any.js
@@ -0,0 +1,5 @@
+// META: global=window,worker
+
+promise_test(t => {
+  return promise_rejects(t, new TypeError(), fetch("../../../xhr/resources/parse-headers.py?my-custom-header="+encodeURIComponent("x\0x")));
+}, "Ensure fetch() rejects null bytes in headers");
diff --git a/xhr/headers-normalize-response.htm b/xhr/headers-normalize-response.htm
index 55a7238943abec..84f2fc8582127b 100644
--- a/xhr/headers-normalize-response.htm
+++ b/xhr/headers-normalize-response.htm
@@ -40,8 +40,4 @@
 matchHeaderValue("   ");
 matchHeaderValue("\t");
 matchHeaderValue("");
-
-promise_test(t => {
-  return promise_rejects(t, new TypeError(), fetch("resources/parse-headers.py?my-custom-header="+encodeURIComponent("x\0x")));
-}, "Ensure fetch() rejects too")
 </script>