diff options
author | Andreu Botella <abb@randomunok.com> | 2021-11-26 09:52:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-26 19:52:41 +1100 |
commit | d763633781be484bb19b458208dd7c11efb83228 (patch) | |
tree | a165f0eefad95df88a0fa50e6bc2412044d7a2cc /ext/fetch/26_fetch.js | |
parent | 6a780543a43d4d370c42b557955200c59bcb21e8 (diff) |
feat(etc/fetch): Support `WebAssembly.instantiateStreaming` for file fetches (#12901)
Fetching of local files, added in #12545, returns a response with no
headers, including the `Content-Type` header. This currently makes it
not work with the WebAssembly streaming APIs, which require the response
to have a content type of `application/wasm`.
Since the only way to obtain a `Response` object with a non-empty `url`
field is via `fetch()`, this change changes the content type requirement
to only apply to responses whose url has the `file:` scheme.
Diffstat (limited to 'ext/fetch/26_fetch.js')
-rw-r--r-- | ext/fetch/26_fetch.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ext/fetch/26_fetch.js b/ext/fetch/26_fetch.js index 47d8b2e85..a66146bee 100644 --- a/ext/fetch/26_fetch.js +++ b/ext/fetch/26_fetch.js @@ -37,6 +37,7 @@ PromisePrototypeThen, PromisePrototypeCatch, String, + StringPrototypeStartsWith, StringPrototypeToLowerCase, TypedArrayPrototypeSubarray, TypeError, @@ -498,12 +499,16 @@ // The spec is ambiguous here, see // https://github.com/WebAssembly/spec/issues/1138. The WPT tests // expect the raw value of the Content-Type attribute lowercased. - const contentType = res.headers.get("Content-Type"); - if ( - typeof contentType !== "string" || - StringPrototypeToLowerCase(contentType) !== "application/wasm" - ) { - throw new TypeError("Invalid WebAssembly content type."); + // We ignore this for file:// because file fetches don't have a + // Content-Type. + if (!StringPrototypeStartsWith(res.url, "file://")) { + const contentType = res.headers.get("Content-Type"); + if ( + typeof contentType !== "string" || + StringPrototypeToLowerCase(contentType) !== "application/wasm" + ) { + throw new TypeError("Invalid WebAssembly content type."); + } } // 2.5. |