Bug 1496621 - reject Fetch promises with (informative) TypeErrors whe…

…n decoding fails, per spec; r=baku reject Fetch promises with (informative) TypeErrors when decoding fails, per spec Differential Revision: https://phabricator.services.mozilla.com/D7970 --HG-- extra : moz-landing-system : lando
EtlerEdelgard · Oct 8, 2018 · ba1f0dc · ba1f0dc
1 parent 1b619b4
commit ba1f0dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 35 deletions.
diff --git a/dom/fetch/FetchConsumer.cpp b/dom/fetch/FetchConsumer.cpp
@@ -767,7 +767,15 @@ FetchBodyConsumer<Derived>::ContinueConsumeBody(nsresult aStatus,
   }
 
   if (NS_WARN_IF(NS_FAILED(aStatus))) {
-    localPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
+    // Per https://fetch.spec.whatwg.org/#concept-read-all-bytes-from-readablestream
+    // Decoding errors should reject with a TypeError
+    if (aStatus == NS_ERROR_INVALID_CONTENT_ENCODING) {
+      IgnoredErrorResult rv;
+      rv.ThrowTypeError<MSG_DOM_DECODING_FAILED>();
+      localPromise->MaybeReject(rv);
+    } else {
+      localPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
+    }
   }
 
   // Don't warn here since we warned above.

diff --git a/dom/fetch/FetchDriver.cpp b/dom/fetch/FetchDriver.cpp
@@ -1221,7 +1221,7 @@ FetchDriver::OnStopRequest(nsIRequest* aRequest,
   if (NS_FAILED(aStatusCode) || !mObserver) {
     nsCOMPtr<nsIAsyncOutputStream> outputStream = do_QueryInterface(mPipeOutputStream);
     if (outputStream) {
-      outputStream->CloseWithStatus(NS_BINDING_FAILED);
+      outputStream->CloseWithStatus(NS_FAILED(aStatusCode) ? aStatusCode : NS_BINDING_FAILED);
     }
     if (altDataListener) {
       altDataListener->Cancel();

diff --git a/testing/web-platform/meta/fetch/content-encoding/bad-gzip-body.any.js.ini b/testing/web-platform/meta/fetch/content-encoding/bad-gzip-body.any.js.ini