diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-24 19:34:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-24 19:34:41 +0200 |
| commit | 844da2ccc666afa713ca1e3e7caa077de4a9250d (patch) | |
| tree | ee10f014c8e45cf67b83541f0c0cd80a8bf755e4 /dom/fetch | |
| parent | c80777a81cddee2e8cacf2a21242630bce9fa7d9 (diff) | |
| parent | 27e021136b6e58143f95ff3df37b58ed699e8b06 (diff) | |
| download | UXP-844da2ccc666afa713ca1e3e7caa077de4a9250d.tar UXP-844da2ccc666afa713ca1e3e7caa077de4a9250d.tar.gz UXP-844da2ccc666afa713ca1e3e7caa077de4a9250d.tar.lz UXP-844da2ccc666afa713ca1e3e7caa077de4a9250d.tar.xz UXP-844da2ccc666afa713ca1e3e7caa077de4a9250d.zip | |
Merge pull request #243 from janekptacijarabaci/fetch_response_body_null_1
moebius#312: DOM - Fix incorrect TypeError: Response body is given with a null body status
Diffstat (limited to 'dom/fetch')
| -rw-r--r-- | dom/fetch/Response.cpp | 8 | ||||
| -rw-r--r-- | dom/fetch/Response.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dom/fetch/Response.cpp b/dom/fetch/Response.cpp index a76071bf8..3b3ada6d3 100644 --- a/dom/fetch/Response.cpp +++ b/dom/fetch/Response.cpp @@ -104,7 +104,7 @@ Response::Redirect(const GlobalObject& aGlobal, const nsAString& aUrl, return nullptr; } - Optional<ArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams> body; + Optional<Nullable<ArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams>> body; ResponseInit init; init.mStatus = aStatus; RefPtr<Response> r = Response::Constructor(aGlobal, body, init, aRv); @@ -125,7 +125,7 @@ Response::Redirect(const GlobalObject& aGlobal, const nsAString& aUrl, /*static*/ already_AddRefed<Response> Response::Constructor(const GlobalObject& aGlobal, - const Optional<ArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams>& aBody, + const Optional<Nullable<ArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams>>& aBody, const ResponseInit& aInit, ErrorResult& aRv) { nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(aGlobal.GetAsSupports()); @@ -191,7 +191,7 @@ Response::Constructor(const GlobalObject& aGlobal, } } - if (aBody.WasPassed()) { + if (aBody.WasPassed() && !aBody.Value().IsNull()) { if (aInit.mStatus == 204 || aInit.mStatus == 205 || aInit.mStatus == 304) { aRv.ThrowTypeError<MSG_RESPONSE_NULL_STATUS_WITH_BODY>(); return nullptr; @@ -200,7 +200,7 @@ Response::Constructor(const GlobalObject& aGlobal, nsCOMPtr<nsIInputStream> bodyStream; nsCString contentType; uint64_t bodySize = 0; - aRv = ExtractByteStreamFromBody(aBody.Value(), + aRv = ExtractByteStreamFromBody(aBody.Value().Value(), getter_AddRefs(bodyStream), contentType, bodySize); diff --git a/dom/fetch/Response.h b/dom/fetch/Response.h index 64b3c5f45..de367bef6 100644 --- a/dom/fetch/Response.h +++ b/dom/fetch/Response.h @@ -114,7 +114,7 @@ public: static already_AddRefed<Response> Constructor(const GlobalObject& aGlobal, - const Optional<ArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams>& aBody, + const Optional<Nullable<ArrayBufferOrArrayBufferViewOrBlobOrFormDataOrUSVStringOrURLSearchParams>>& aBody, const ResponseInit& aInit, ErrorResult& rv); nsIGlobalObject* GetParentObject() const |