Diff
Modified: trunk/LayoutTests/ChangeLog (263625 => 263626)
--- trunk/LayoutTests/ChangeLog 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/ChangeLog 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,3 +1,14 @@
+2020-06-27 Chris Dumez <cdu...@apple.com>
+
+ Update web-platform-tests/cors from upstream
+ https://bugs.webkit.org/show_bug.cgi?id=213668
+
+ Reviewed by Sam Weinig.
+
+ Update web-platform-tests/cors from upstream b076c305a256e7.
+
+ * tests-options.json:
+
2020-06-26 Diego Pino Garcia <dp...@igalia.com>
[GLIB] Unreviewed test gardening. Update test expectations after r263609.
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,3 +1,14 @@
+2020-06-27 Chris Dumez <cdu...@apple.com>
+
+ Update web-platform-tests/cors from upstream
+ https://bugs.webkit.org/show_bug.cgi?id=213668
+
+ Reviewed by Sam Weinig.
+
+ Update web-platform-tests/cors from upstream b076c305a256e7.
+
+ * web-platform-tests/cors/*: Updated.
+
2020-06-27 Rob Buis <rb...@igalia.com>
Require <form> to be connected
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/304.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/304.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/304.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<meta charset=utf-8>
<title>CORS - 304 Responses</title>
+<meta name="timeout" content="long">
<meta name=author title="Mark Nottingham" href=""
<script src=""
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/META.yml (0 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/META.yml (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/META.yml 2020-06-27 17:36:43 UTC (rev 263626)
@@ -0,0 +1,7 @@
+spec: https://fetch.spec.whatwg.org/#http-cors-protocol
+suggested_reviewers:
+ - zqzhang
+ - odinho
+ - hillbrad
+ - jdm
+ - annevk
Deleted: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/OWNERS (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/OWNERS 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/OWNERS 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,5 +0,0 @@
-@zqzhang
-@odinho
-@hillbrad
-@jdm
-@annevk
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative-expected.txt (0 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -0,0 +1,5 @@
+Request headers
+
+
+FAIL Client hint headers are simple headers A network error occurred.
+
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative.htm (0 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative.htm (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CORS and Client Hints, potentially</title>
+
+<script src=""
+<script src=""
+<script src=""
+
+<h1>Request headers</h1>
+<div id=log></div>
+<script>
+
+test(function() {
+ var client = new XMLHttpRequest()
+ client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print,', false)
+ client.setRequestHeader('x-print', 'unicorn')
+ client.setRequestHeader('content-type', 'text/plain')
+ client.setRequestHeader('accept', 'test')
+ client.setRequestHeader('accept-language', 'nn')
+ client.setRequestHeader('content-language', 'nn')
+ client.setRequestHeader('save-data', 'on')
+ client.setRequestHeader('device-memory', '1.0')
+ client.setRequestHeader('dpr', '2.0')
+ client.setRequestHeader('width', '35')
+ client.setRequestHeader('viewport-width', '42')
+ client.send(null)
+
+ const res = JSON.parse(client.response)
+ assert_equals(res['x-print'], 'unicorn')
+ assert_equals(res['content-type'], 'text/plain')
+ assert_equals(res['accept'], 'test')
+ assert_equals(res['accept-language'], 'nn')
+ assert_equals(res['content-language'], 'nn')
+ assert_equals(res['save-data'], 'on')
+ assert_equals(res['device-memory'], '1.0')
+ assert_equals(res['dpr'], '2.0')
+ assert_equals(res['width'], '35')
+ assert_equals(res['viewport-width'], '42')
+}, 'Client hint headers are simple headers')
+
+</script>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-expected.txt (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-expected.txt 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,7 +1,6 @@
Request headers
-FAIL Client hint headers are simple headers A network error occurred.
PASS Unspecified request headers are disallowed
PASS Unextractable device-memory client hint header is disallowed
PASS Unextractable DPR client hint header is disallowed
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<meta charset=utf-8>
-<title>CORS - client hint request headers - Access-Control-Allow-Headers</title>
+<title>CORS and Client Hints</title>
<script src=""
<script src=""
@@ -12,38 +12,10 @@
test(function() {
var client = new XMLHttpRequest()
- client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print,', false)
- client.setRequestHeader('x-print', 'unicorn')
- client.setRequestHeader('content-type', 'text/plain')
- client.setRequestHeader('accept', 'test')
- client.setRequestHeader('accept-language', 'nn')
- client.setRequestHeader('content-language', 'nn')
- client.setRequestHeader('save-data', 'on')
- client.setRequestHeader('device-memory', '1.0')
- client.setRequestHeader('dpr', '2.0')
- client.setRequestHeader('width', '35')
- client.setRequestHeader('viewport-width', '42')
- client.send(null)
-
- const res = JSON.parse(client.response)
- assert_equals(res['x-print'], 'unicorn')
- assert_equals(res['content-type'], 'text/plain')
- assert_equals(res['accept'], 'test')
- assert_equals(res['accept-language'], 'nn')
- assert_equals(res['content-language'], 'nn')
- assert_equals(res['save-data'], 'on')
- assert_equals(res['device-memory'], '1.0')
- assert_equals(res['dpr'], '2.0')
- assert_equals(res['width'], '35')
- assert_equals(res['viewport-width'], '42')
-}, 'Client hint headers are simple headers')
-
-test(function() {
- var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
client.setRequestHeader('x-print', 'unicorn')
client.setRequestHeader('y-print', 'unicorn')
- assert_throws("NetworkError", function() { client.send(null) })
+ assert_throws_dom("NetworkError", function() { client.send(null) })
}, 'Unspecified request headers are disallowed')
test(function() {
@@ -50,7 +22,7 @@
var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
client.setRequestHeader('device-memory', '')
- assert_throws("NetworkError", function() { client.send(null) })
+ assert_throws_dom("NetworkError", function() { client.send(null) })
}, 'Unextractable device-memory client hint header is disallowed')
test(function() {
@@ -57,7 +29,7 @@
var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
client.setRequestHeader('dpr', '')
- assert_throws("NetworkError", function() { client.send(null) })
+ assert_throws_dom("NetworkError", function() { client.send(null) })
}, 'Unextractable DPR client hint header is disallowed')
test(function() {
@@ -64,7 +36,7 @@
var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
client.setRequestHeader('width', '')
- assert_throws("NetworkError", function() { client.send(null) })
+ assert_throws_dom("NetworkError", function() { client.send(null) })
}, 'Unextractable width client hint header is disallowed')
test(function() {
@@ -71,7 +43,7 @@
var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
client.setRequestHeader('viewport-width', '')
- assert_throws("NetworkError", function() { client.send(null) })
+ assert_throws_dom("NetworkError", function() { client.send(null) })
}, 'Unextractable viewport-width client hint header is disallowed')
</script>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/cors-safelisted-request-header.any.js (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/cors-safelisted-request-header.any.js 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/cors-safelisted-request-header.any.js 2020-06-27 17:36:43 UTC (rev 263626)
@@ -11,7 +11,7 @@
checkURL = "resources/preflight.py?check&token=" + uuid,
request = () => fetch(url, { method: "POST", headers, body: "data" });
if (expectPreflight) {
- await promise_rejects(t, TypeError(), request());
+ await promise_rejects_js(t, TypeError, request());
} else {
const response = await request();
assert_equals(response.headers.get("content-type"), "text/plain");
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag-expected.txt (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag-expected.txt 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -8,7 +8,12 @@
PASS Access-Control-Allow-Credentials: TRUE should be disallowed (async)
PASS Access-Control-Allow-Credentials: True should be disallowed (async)
PASS Access-Control-Allow-Credentials: "true" should be disallowed (async)
+PASS Access-Control-Allow-Credentials: 'true' should be disallowed (async)
PASS Access-Control-Allow-Credentials: false should be disallowed (async)
PASS Access-Control-Allow-Credentials: 1 should be disallowed (async)
PASS Access-Control-Allow-Credentials: 0 should be disallowed (async)
+PASS Access-Control-Allow-Credentials: ,true should be disallowed (async)
+PASS Access-Control-Allow-Credentials: true, should be disallowed (async)
+FAIL Access-Control-Allow-Credentials: true%0B should be disallowed (async) assert_unreached: onload Reached unreachable code
+FAIL Access-Control-Allow-Credentials: true%0C should be disallowed (async) assert_unreached: onload Reached unreachable code
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -122,8 +122,13 @@
test_response_header('TRUE')
test_response_header('True')
test_response_header('"true"')
+test_response_header("'true'");
test_response_header('false')
test_response_header('1')
test_response_header('0')
+test_response_header(',true');
+test_response_header('true,');
+test_response_header('true%0B');
+test_response_header('true%0C');
</script>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/origin-expected.txt (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/origin-expected.txt 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/origin-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -30,8 +30,14 @@
PASS Disallow origin: HTTP://localhost:8800
PASS Disallow origin: -
PASS Disallow origin: **
+PASS Disallow origin: ,*
+PASS Disallow origin: *,
PASS Disallow origin: \0*
+FAIL Disallow origin: * assert_throws_dom: send function "function () { client.send() }" did not throw
+FAIL Disallow origin: * assert_throws_dom: send function "function () { client.send() }" did not throw
PASS Disallow origin: *\0
+FAIL Disallow origin: * assert_throws_dom: send function "function () { client.send() }" did not throw
+FAIL Disallow origin: * assert_throws_dom: send function "function () { client.send() }" did not throw
PASS Disallow origin: '*'
PASS Disallow origin: "*"
PASS Disallow origin: * *
@@ -52,7 +58,7 @@
PASS Disallow origin: localhost:8800
PASS Disallow origin: .localhost:8800
PASS Disallow origin: *.localhost:8800
-FAIL Disallow origin: http://localhost:8800 assert_throws: send function "function () { client.send() }" did not throw
+FAIL Disallow origin: http://localhost:8800 assert_throws_dom: send function "function () { client.send() }" did not throw
PASS Disallow origin: http://.localhost:8800
PASS Disallow origin: http://*.localhost:8800
PASS Disallow multiple headers (, *)
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/origin.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/origin.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/origin.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<meta charset=utf-8>
<title>Access-Control-Allow-Origin handling</title>
+<meta name="timeout" content="long">
<link rel=help href=""
<meta name=author title="Odin Hørthe Omdal" href=""
@@ -47,7 +48,7 @@
+ '/resources/cors-makeheader.py?origin='
+ encodeURIComponent(origin),
false)
- assert_throws("NetworkError", function() { client.send() }, 'send')
+ assert_throws_dom("NetworkError", function() { client.send() }, 'send')
}, 'Disallow origin: ' + origin.replace(/\0/g, "\\0"));
}
@@ -71,8 +72,14 @@
shouldFail(location.protocol.toUpperCase() + "//" + location.host)
shouldFail("-")
shouldFail("**")
+shouldFail(",*");
+shouldFail("*,");
shouldFail("\0*")
+shouldFail("\u000B*");
+shouldFail("\u000C*");
shouldFail("*\0")
+shouldFail("*\u000B");
+shouldFail("*\u000C");
shouldFail("'*'")
shouldFail('"*"')
shouldFail("* *")
@@ -105,7 +112,7 @@
+ encodeURIComponent(origin)
+ '&origin2=' + encodeURIComponent(origin2),
false)
- assert_throws("NetworkError", function() { client.send() }, 'send')
+ assert_throws_dom("NetworkError", function() { client.send() }, 'send')
}, 'Disallow multiple headers (' + origin + ', ' + origin2 + ')');
}
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/preflight-cache-expected.txt (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/preflight-cache-expected.txt 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/preflight-cache-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -3,6 +3,7 @@
PASS Test preflight
PASS preflight for x-print should be cached
+PASS age = blank, should be cached
PASS age = 0, should not be cached
FAIL age = -1, should not be cached assert_equals: did preflight expected "1" but got "0"
PASS preflight first request, second from cache, wait, third should preflight again
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/preflight-cache.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/preflight-cache.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/preflight-cache.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<meta charset=utf-8>
<title>CORS - preflight cache</title>
+<meta name="timeout" content="long">
<meta name=author title="Odin Hørthe Omdal" href=""
<script src=""
@@ -63,6 +64,15 @@
var time = new Date().getTime()
var client = new XMLHttpRequest()
+ var id = did_preflight(true, client, {extra:'max_age='})
+ did_preflight(false, client, {extra:'max_age=', token: id})
+},
+'age = blank, should be cached')
+
+test(function() {
+ var time = new Date().getTime()
+ var client = new XMLHttpRequest()
+
var id = did_preflight(true, client, {extra:'max_age=0'})
did_preflight(true, client, {extra:'max_age=0', token: id})
},
@@ -78,7 +88,7 @@
'age = -1, should not be cached');
(function() {
- var test = async_test("preflight first request, second from cache, wait, third should preflight again", { timeout: 6000 }),
+ var test = async_test("preflight first request, second from cache, wait, third should preflight again"),
time = new Date().getTime(),
dothing = function (url, msg, set_request, func) {
client = new XMLHttpRequest(),
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/request-headers.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/request-headers.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/request-headers.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -48,7 +48,7 @@
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
client.setRequestHeader('x-print', 'unicorn')
client.setRequestHeader('y-print', 'unicorn')
- assert_throws("NetworkError", function() { client.send(null) })
+ assert_throws_dom("NetworkError", function() { client.send(null) })
}, 'Unspecified request headers are disallowed')
test(function() {
@@ -65,7 +65,7 @@
test(function() {
var client = new XMLHttpRequest()
- assert_throws('INVALID_STATE_ERR', function() { client.setRequestHeader('x-print', 'unicorn') })
+ assert_throws_dom('INVALID_STATE_ERR', function() { client.setRequestHeader('x-print', 'unicorn') })
},
'INVALID_STATE_ERR on setRequestHeader before open()')
@@ -73,7 +73,7 @@
var client = new XMLHttpRequest()
client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=,y-lol,x-PriNT,%20,,,Y-PRINT', false)
client.send()
- assert_throws('INVALID_STATE_ERR', function() { client.setRequestHeader('x-print', 'unicorn') })
+ assert_throws_dom('INVALID_STATE_ERR', function() { client.setRequestHeader('x-print', 'unicorn') })
},
'INVALID_STATE_ERR on setRequestHeader after send()')
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/304.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/304.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/304.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,62 +1,62 @@
#!/usr/bin/env python
# A header used to correlate requests and responses
-state_header = "content-language"
+state_header = b"content-language"
# Static ETag to use (and expect)
-etag = "abcdef"
+etag = b"abcdef"
def error(msg):
- return (299, "Client Error"), [
- ('content-type', 'text/plain'),
- ('access-control-allow-origin', "*"),
- ('access-control-expose-headers', state_header),
- ('cache-control', 'no-store')
+ return (299, u"Client Error"), [
+ (b'content-type', b'text/plain'),
+ (b'access-control-allow-origin', b"*"),
+ (b'access-control-expose-headers', state_header),
+ (b'cache-control', b'no-store')
], msg
def main(request, response):
headers = []
- inm = request.headers.get('if-none-match', None)
+ inm = request.headers.get(b'if-none-match', None)
raw_req_num = request.headers.get(state_header, None)
if raw_req_num == None:
- return error("no req_num header in request")
+ return error(u"no req_num header in request")
else:
req_num = int(raw_req_num)
if req_num > 8:
- return error("req_num %s out of range" % req_num)
+ return error(u"req_num %s out of range" % req_num)
- headers.append(("Access-Control-Expose-Headers", state_header))
+ headers.append((b"Access-Control-Expose-Headers", state_header))
headers.append((state_header, req_num))
- headers.append(("A", req_num))
- headers.append(("B", req_num))
+ headers.append((b"A", req_num))
+ headers.append((b"B", req_num))
if req_num % 2: # odd requests are the first in a test pair
if inm:
# what are you doing here? This should be a fresh request.
- return error("If-None-Match on first request")
+ return error(u"If-None-Match on first request")
else:
- status = 200, "OK"
- headers.append(("Access-Control-Allow-Origin", "*"))
- headers.append(("Content-Type", "text/plain"))
- headers.append(("Cache-Control", "private, max-age=3, must-revalidate"))
- headers.append(("ETag", etag))
- return status, headers, "Success"
+ status = 200, u"OK"
+ headers.append((b"Access-Control-Allow-Origin", b"*"))
+ headers.append((b"Content-Type", b"text/plain"))
+ headers.append((b"Cache-Control", b"private, max-age=3, must-revalidate"))
+ headers.append((b"ETag", etag))
+ return status, headers, u"Success"
else: # even requests are the second in a pair, and should have a good INM.
if inm != etag:
# Bad browser.
if inm == None:
- return error("If-None-Match missing")
+ return error(u"If-None-Match missing")
else:
- return error("If-None-Match '%s' mismatches")
+ return error(u"If-None-Match '%s' mismatches")
else:
if req_num == 2:
pass # basic, vanilla check
elif req_num == 4:
- headers.append(("Access-Control-Expose-Headers", "a, b"))
+ headers.append((b"Access-Control-Expose-Headers", b"a, b"))
elif req_num == 6:
- headers.append(("Access-Control-Expose-Headers", "a"))
+ headers.append((b"Access-Control-Expose-Headers", b"a"))
elif req_num == 8:
- headers.append(("Access-Control-Allow-Origin", "other.origin.example:80"))
- status = 304, "Not Modified"
- return status, headers, ""
+ headers.append((b"Access-Control-Allow-Origin", b"other.origin.example:80"))
+ status = 304, u"Not Modified"
+ return status, headers, u""
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cache-304.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cache-304.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cache-304.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,10 +1,10 @@
def main(request, response):
- match = request.headers.get("If-None-Match", None)
- if match is not None and match == "mybestscript-v1":
- response.status = (304, "YEP")
- return ""
- response.headers.set("Access-Control-Allow-Origin", "*")
- response.headers.set("Cache-Control", "must-revalidate")
- response.headers.set("ETag", "mybestscript-v1")
- response.headers.set("Content-Type", "text/_javascript_")
- return "function hep() { }"
+ match = request.headers.get(b"If-None-Match", None)
+ if match is not None and match == b"mybestscript-v1":
+ response.status = (304, u"YEP")
+ return u""
+ response.headers.set(b"Access-Control-Allow-Origin", b"*")
+ response.headers.set(b"Cache-Control", b"must-revalidate")
+ response.headers.set(b"ETag", b"mybestscript-v1")
+ response.headers.set(b"Content-Type", b"text/_javascript_")
+ return u"function hep() { }"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/checkandremove.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/checkandremove.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/checkandremove.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,6 +1,6 @@
def main(request, response):
- token = request.GET.first("token")
+ token = request.GET.first(b"token")
if request.server.stash.remove(token) is not None:
- return "1"
+ return u"1"
else:
- return "0"
+ return u"0"
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-cookie.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-cookie.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-cookie.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,21 +1,21 @@
def main(request, response):
- origin = request.GET.first("origin", request.headers["origin"])
- credentials = request.GET.first("credentials", "true")
+ origin = request.GET.first(b"origin", request.headers[b"origin"])
+ credentials = request.GET.first(b"credentials", b"true")
- headers = [("Content-Type", "text/plain")]
- if origin != 'none':
- headers.append(("Access-Control-Allow-Origin", origin))
- if credentials != 'none':
- headers.append(("Access-Control-Allow-Credentials", credentials))
+ headers = [(b"Content-Type", b"text/plain")]
+ if origin != b'none':
+ headers.append((b"Access-Control-Allow-Origin", origin))
+ if credentials != b'none':
+ headers.append((b"Access-Control-Allow-Credentials", credentials))
- ident = request.GET.first('ident', 'test')
+ ident = request.GET.first(b'ident', b'test')
if ident in request.cookies:
body = request.cookies[ident].value
response.delete_cookie(ident)
else:
- response.set_cookie(ident, "COOKIE")
- body = "NO_COOKIE"
+ response.set_cookie(ident, b"COOKIE")
+ body = u"NO_COOKIE"
return headers, body
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-makeheader.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-makeheader.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-makeheader.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,67 +1,69 @@
import json
+from wptserve.utils import isomorphic_decode
+
def main(request, response):
- origin = request.GET.first("origin", request.headers.get('origin'))
+ origin = request.GET.first(b"origin", request.headers.get(b'origin'))
- if "check" in request.GET:
- token = request.GET.first("token")
+ if b"check" in request.GET:
+ token = request.GET.first(b"token")
value = request.server.stash.take(token)
if value is not None:
- if request.GET.first("check", None) == "keep":
+ if request.GET.first(b"check", None) == b"keep":
request.server.stash.put(token, value)
- body = "1"
+ body = u"1"
else:
- body = "0"
- return [("Content-Type", "text/plain")], body
+ body = u"0"
+ return [(b"Content-Type", b"text/plain")], body
- if origin != 'none':
- response.headers.set("Access-Control-Allow-Origin", origin)
- if 'origin2' in request.GET:
- response.headers.append("Access-Control-Allow-Origin", request.GET.first('origin2'))
+ if origin != b'none':
+ response.headers.set(b"Access-Control-Allow-Origin", origin)
+ if b'origin2' in request.GET:
+ response.headers.append(b"Access-Control-Allow-Origin", request.GET.first(b'origin2'))
#Preflight
- if 'headers' in request.GET:
- response.headers.set("Access-Control-Allow-Headers", request.GET.first('headers'))
- if 'credentials' in request.GET:
- response.headers.set("Access-Control-Allow-Credentials", request.GET.first('credentials'))
- if 'methods' in request.GET:
- response.headers.set("Access-Control-Allow-Methods", request.GET.first('methods'))
+ if b'headers' in request.GET:
+ response.headers.set(b"Access-Control-Allow-Headers", request.GET.first(b'headers'))
+ if b'credentials' in request.GET:
+ response.headers.set(b"Access-Control-Allow-Credentials", request.GET.first(b'credentials'))
+ if b'methods' in request.GET:
+ response.headers.set(b"Access-Control-Allow-Methods", request.GET.first(b'methods'))
- code_raw = request.GET.first('code', None)
+ code_raw = request.GET.first(b'code', None)
if code_raw:
code = int(code_raw)
else:
code = None
- if request.method == 'OPTIONS':
+ if request.method == u'OPTIONS':
#Override the response code if we're in a preflight and it's asked
- if 'preflight' in request.GET:
- code = int(request.GET.first('preflight'))
+ if b'preflight' in request.GET:
+ code = int(request.GET.first(b'preflight'))
#Log that the preflight actually happened if we have an ident
- if 'token' in request.GET:
- request.server.stash.put(request.GET['token'], True)
+ if b'token' in request.GET:
+ request.server.stash.put(request.GET[b'token'], True)
- if 'location' in request.GET:
+ if b'location' in request.GET:
if code is None:
code = 302
if code >= 300 and code < 400:
- response.headers.set("Location", request.GET.first('location'))
+ response.headers.set(b"Location", request.GET.first(b'location'))
headers = {}
- for name, values in request.headers.iteritems():
+ for name, values in request.headers.items():
if len(values) == 1:
- headers[name] = values[0]
+ headers[isomorphic_decode(name)] = isomorphic_decode(values[0])
else:
#I have no idea, really
headers[name] = values
- headers['get_value'] = request.GET.first('get_value', '')
+ headers[u'get_value'] = isomorphic_decode(request.GET.first(b'get_value', b''))
body = json.dumps(headers)
if code:
- return (code, "StatusText"), [], body
+ return (code, u"StatusText"), [], body
else:
return body
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/expose-headers.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/expose-headers.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/expose-headers.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,10 +1,10 @@
def main(request, response):
response.add_required_headers = False
- output = "HTTP/1.1 221 ALL YOUR BASE BELONG TO H1\r\n"
- output += "Access-Control-Allow-Origin: *\r\n"
- output += "BB-8: hey\r\n"
- output += "Content-Language: mkay\r\n"
- output += request.GET.first("expose") + "\r\n"
- output += "\r\n"
+ output = b"HTTP/1.1 221 ALL YOUR BASE BELONG TO H1\r\n"
+ output += b"Access-Control-Allow-Origin: *\r\n"
+ output += b"BB-8: hey\r\n"
+ output += b"Content-Language: mkay\r\n"
+ output += request.GET.first(b"expose") + b"\r\n"
+ output += b"\r\n"
response.writer.write(output)
response.close_connection = True
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/preflight.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/preflight.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/preflight.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,35 +1,35 @@
def main(request, response):
- headers = [("Content-Type", "text/plain")]
+ headers = [(b"Content-Type", b"text/plain")]
- if "check" in request.GET:
- token = request.GET.first("token")
+ if b"check" in request.GET:
+ token = request.GET.first(b"token")
value = request.server.stash.take(token)
if value == None:
- body = "0"
+ body = u"0"
else:
- if request.GET.first("check", None) == "keep":
+ if request.GET.first(b"check", None) == b"keep":
request.server.stash.put(token, value)
- body = "1"
+ body = u"1"
return headers, body
- if request.method == "OPTIONS":
- if not "Access-Control-Request-Method" in request.headers:
- response.set_error(400, "No Access-Control-Request-Method header")
- return "ERROR: No access-control-request-method in preflight!"
+ if request.method == u"OPTIONS":
+ if not b"Access-Control-Request-Method" in request.headers:
+ response.set_error(400, u"No Access-Control-Request-Method header")
+ return u"ERROR: No access-control-request-method in preflight!"
- headers.append(("Access-Control-Allow-Methods",
- request.headers['Access-Control-Request-Method']))
+ headers.append((b"Access-Control-Allow-Methods",
+ request.headers[b'Access-Control-Request-Method']))
- if "max_age" in request.GET:
- headers.append(("Access-Control-Max-Age", request.GET['max_age']))
+ if b"max_age" in request.GET:
+ headers.append((b"Access-Control-Max-Age", request.GET[b'max_age']))
- if "token" in request.GET:
- request.server.stash.put(request.GET.first("token"), 1)
+ if b"token" in request.GET:
+ request.server.stash.put(request.GET.first(b"token"), 1)
- headers.append(("Access-Control-Allow-Origin", "*"))
- headers.append(("Access-Control-Allow-Headers", "x-print"))
+ headers.append((b"Access-Control-Allow-Origin", b"*"))
+ headers.append((b"Access-Control-Allow-Headers", b"x-print"))
- body = request.headers.get("x-print", "NO")
+ body = request.headers.get(b"x-print", b"NO")
return headers, body
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/status.py (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/status.py 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/status.py 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,37 +1,39 @@
+from wptserve.utils import isomorphic_encode
+
def main(request, response):
- response.headers.set("Access-Control-Allow-Origin", request.headers.get("origin"))
- response.headers.set("Access-Control-Expose-Headers", "X-Request-Method")
+ response.headers.set(b"Access-Control-Allow-Origin", request.headers.get(b"origin"))
+ response.headers.set(b"Access-Control-Expose-Headers", b"X-Request-Method")
- if request.method == 'OPTIONS':
- response.headers.set("Access-Control-Allow-Methods", "GET, CHICKEN, HEAD, POST, PUT")
+ if request.method == u'OPTIONS':
+ response.headers.set(b"Access-Control-Allow-Methods", b"GET, CHICKEN, HEAD, POST, PUT")
- if 'headers' in request.GET:
- response.headers.set("Access-Control-Allow-Headers", request.GET.first('headers'))
+ if b'headers' in request.GET:
+ response.headers.set(b"Access-Control-Allow-Headers", request.GET.first(b'headers'))
- response.headers.set("X-Request-Method", request.method)
+ response.headers.set(b"X-Request-Method", isomorphic_encode(request.method))
- response.headers.set("X-A-C-Request-Method", request.headers.get("Access-Control-Request-Method", ""))
+ response.headers.set(b"X-A-C-Request-Method", request.headers.get(b"Access-Control-Request-Method", b""))
#This should reasonably work for most response codes.
try:
- code = int(request.GET.first("code", 200))
+ code = int(request.GET.first(b"code", 200))
except ValueError:
code = 200
- text = request.GET.first("text", "OMG")
+ text = request.GET.first(b"text", b"OMG")
- if request.method == "OPTIONS" and "preflight" in request.GET:
+ if request.method == u"OPTIONS" and b"preflight" in request.GET:
try:
- code = int(request.GET.first('preflight'))
+ code = int(request.GET.first(b'preflight'))
except KeyError:
pass
status = code, text
- if "type" in request.GET:
- response.headers.set("Content-Type", request.GET.first('type'))
+ if b"type" in request.GET:
+ response.headers.set(b"Content-Type", request.GET.first(b'type'))
- body = request.GET.first('content', "")
+ body = request.GET.first(b'content', b"")
return status, [], body
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/w3c-import.log (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/w3c-import.log 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/resources/w3c-import.log 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,7 +1,7 @@
The tests in this directory were imported from the W3C repository.
Do NOT modify these tests directly in WebKit.
Instead, create a pull request on the WPT github:
- https://github.com/w3c/web-platform-tests
+ https://github.com/web-platform-tests/wpt
Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
@@ -15,12 +15,13 @@
------------------------------------------------------------------------
List of files:
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/304.py
-/LayoutTests/imported/w3c/web-platform-tests/cors/resources/access-control-expose-headers-parsing-2.asis
-/LayoutTests/imported/w3c/web-platform-tests/cors/resources/access-control-expose-headers-parsing.asis
+/LayoutTests/imported/w3c/web-platform-tests/cors/resources/access-control-expose-headers.json
+/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cache-304.py
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/checkandremove.py
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-cookie.py
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-headers.asis
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/cors-makeheader.py
+/LayoutTests/imported/w3c/web-platform-tests/cors/resources/expose-headers.py
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/image-tainting-checker.sub.html
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/preflight.py
/LayoutTests/imported/w3c/web-platform-tests/cors/resources/remote-xhrer.html
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative-expected.txt (0 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -0,0 +1,9 @@
+Simple requests
+
+Simple requests shouldn't trigger preflight
+
+
+FAIL No preflight GET and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"} A network error occurred.
+FAIL No preflight HEAD and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"} A network error occurred.
+FAIL No preflight POST and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"} A network error occurred.
+
Copied: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative.htm (from rev 263625, trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests.htm) (0 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative.htm (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CORS - simple requests</title>
+<meta name=author title="Odin Hørthe Omdal" href=""
+
+<script src=""
+<script src=""
+<script src=""
+<script src=""
+
+<h1>Simple requests</h1>
+<p>Simple requests shouldn't trigger preflight</p>
+
+<div id=log></div>
+<script>
+
+var test_c = 0;
+
+function check_simple(method, headers)
+{
+ test(function() {
+ var client = new XMLHttpRequest()
+ var uuid_token = token();
+ client.open(method, CROSSDOMAIN + 'resources/preflight.py?token='
+ + uuid_token, false)
+ for (head in headers)
+ client.setRequestHeader(head, headers[head])
+ client.send("data")
+ assert_equals(client.getResponseHeader('content-type'), "text/plain")
+ if (method == 'HEAD')
+ assert_equals(client.response, '', 'response')
+ else
+ assert_equals(client.response, 'NO', 'response')
+
+ client.open('GET', 'resources/preflight.py?check&token='
+ + uuid_token, false)
+ client.send("data")
+ assert_equals(client.response, "0", "Found preflight log")
+ },
+ 'No preflight ' + method + ' and ' + JSON.stringify(headers))
+}
+
+function check_simple_headers(headers) {
+ check_simple('GET', headers)
+ check_simple('HEAD', headers)
+ check_simple('POST', headers)
+}
+
+check_simple_headers({
+ 'save-data': 'on',
+ 'device-memory': '2.0',
+ 'dpr': '3.0',
+ 'width': '1200',
+ 'viewport-width': '1300'
+ })
+
+</script>
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-expected.txt (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-expected.txt 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-expected.txt 2020-06-27 17:36:43 UTC (rev 263626)
@@ -24,10 +24,7 @@
PASS No preflight GET and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}
PASS No preflight HEAD and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}
PASS No preflight POST and {"accept":"test","accept-language":"test","content-language":"test","content-type":"text/plain; parameter=whatever"}
-FAIL No preflight GET and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"} A network error occurred.
-FAIL No preflight HEAD and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"} A network error occurred.
-FAIL No preflight POST and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"} A network error occurred.
PASS No preflight Get and {"content-type":"text/plain; parameter=extra_bonus"}
PASS No preflight post and {"content-type":"text/plain"}
-FAIL Check simple headers (async) assert_unreached: onerror Reached unreachable code
+PASS Check simple headers (async)
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -61,14 +61,6 @@
'content-type': 'text/plain; parameter=whatever'
})
-check_simple_headers({
- 'save-data': 'on',
- 'device-memory': '2.0',
- 'dpr': '3.0',
- 'width': '1200',
- 'viewport-width': '1300'
- })
-
check_simple('Get', {'content-type': 'text/plain; parameter=extra_bonus'})
check_simple('post', {'content-type': 'text/plain'})
@@ -83,9 +75,9 @@
+ uuid_token, true)
client.setRequestHeader('Accept', 'jewelry')
- client.setRequestHeader('accept-language', 'nn_NO,nn,en')
+ client.setRequestHeader('accept-language', 'nn-NO,nn,en')
client.setRequestHeader('content-type', 'text/plain; parameter=extra')
- client.setRequestHeader('content-Language', 'nn_NO')
+ client.setRequestHeader('content-Language', 'nn-NO')
client._onload_ = simple_async.step_func(function() {
assert_equals(client.getResponseHeader('content-type'), "text/plain", 'content-type response header')
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/status-async.htm (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/status-async.htm 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/status-async.htm 2020-06-27 17:36:43 UTC (rev 263626)
@@ -14,7 +14,7 @@
<script>
function statusRequest(method, code, text, content, type) {
- async_test("Status on " + method + " " + code, { timeout: 15000 })
+ async_test("Status on " + method + " " + code)
.step(function() {
var client = new XMLHttpRequest()
client.open(method, CROSSDOMAIN + "resources/status.py?code="
@@ -60,7 +60,7 @@
if (expect_code === undefined)
expect_code = code
- async_test("Status on " + method + " " + code + (nonsimple?' (nonsimple)':''), { timeout: 15000 })
+ async_test("Status on " + method + " " + code + (nonsimple?' (nonsimple)':''))
.step(function() {
var client = new XMLHttpRequest()
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/support.js (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/support.js 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/support.js 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,16 +1,3 @@
-// For ignoring exception names (just for testing)
-/*
-_real_assert_throws = assert_throws;
-function assert_throws(d, func, desc) {
- try {
- func();
- } catch(e) {
- return true;
- }
- assert_unreached("Didn't throw!");
-}
-*/
-
function dirname(path) {
return path.replace(/\/[^\/]*$/, '/')
}
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/cors/w3c-import.log (263625 => 263626)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/cors/w3c-import.log 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/cors/w3c-import.log 2020-06-27 17:36:43 UTC (rev 263626)
@@ -1,7 +1,7 @@
The tests in this directory were imported from the W3C repository.
Do NOT modify these tests directly in WebKit.
Instead, create a pull request on the WPT github:
- https://github.com/w3c/web-platform-tests
+ https://github.com/web-platform-tests/wpt
Then run the Tools/Scripts/import-w3c-tests in WebKit to reimport
@@ -15,12 +15,13 @@
------------------------------------------------------------------------
List of files:
/LayoutTests/imported/w3c/web-platform-tests/cors/304.htm
-/LayoutTests/imported/w3c/web-platform-tests/cors/OWNERS
+/LayoutTests/imported/w3c/web-platform-tests/cors/META.yml
/LayoutTests/imported/w3c/web-platform-tests/cors/README.md
/LayoutTests/imported/w3c/web-platform-tests/cors/access-control-expose-headers-parsing.window.js
-/LayoutTests/imported/w3c/web-platform-tests/cors/allow-headers.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/basic.htm
+/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers-2.tentative.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/client-hint-request-headers.htm
+/LayoutTests/imported/w3c/web-platform-tests/cors/cors-safelisted-request-header.any.js
/LayoutTests/imported/w3c/web-platform-tests/cors/credentials-flag.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/image-tainting-in-cross-origin-iframe.sub.html
/LayoutTests/imported/w3c/web-platform-tests/cors/late-upload-events.htm
@@ -34,6 +35,8 @@
/LayoutTests/imported/w3c/web-platform-tests/cors/remote-origin.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/request-headers.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/response-headers.htm
+/LayoutTests/imported/w3c/web-platform-tests/cors/script-304.html
+/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests-ch.tentative.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/simple-requests.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/status-async.htm
/LayoutTests/imported/w3c/web-platform-tests/cors/status-preflight.htm
Modified: trunk/LayoutTests/tests-options.json (263625 => 263626)
--- trunk/LayoutTests/tests-options.json 2020-06-27 17:00:49 UTC (rev 263625)
+++ trunk/LayoutTests/tests-options.json 2020-06-27 17:36:43 UTC (rev 263626)
@@ -608,6 +608,15 @@
"imported/w3c/web-platform-tests/content-security-policy/style-src/style-src-multiple-policies-multiple-hashing-algorithms.html": [
"slow"
],
+ "imported/w3c/web-platform-tests/cors/304.htm": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/cors/origin.htm": [
+ "slow"
+ ],
+ "imported/w3c/web-platform-tests/cors/preflight-cache.htm": [
+ "slow"
+ ],
"imported/w3c/web-platform-tests/cors/status-async.htm": [
"slow"
],
