Merge pull request #8866 from Snuffleupagus/fix-non-HTTP-validateResp…

…onseStatus Correctly validate the response status for non-HTTP fetch requests (PR 8768 follow-up)
mozilla · Sep 5, 2017 · 9b14f8e · 9b14f8e
2 parents 4edd4fb + 41415ba
commit 9b14f8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/display/fetch_stream.js b/src/display/fetch_stream.js
@@ -94,7 +94,7 @@ class PDFFetchStreamReader {
     let url = this._stream.source.url;
     fetch(url, createFetchOptions(this._headers, this._withCredentials)).
         then((response) => {
-      if (!validateResponseStatus(response.status, this._stream.isHttp)) {
+      if (!validateResponseStatus(response.status)) {
         throw createResponseStatusError(response.status, url);
       }
       this._reader = response.body.getReader();
@@ -188,7 +188,7 @@ class PDFFetchStreamRangeReader {
     let url = this._stream.source.url;
     fetch(url, createFetchOptions(this._headers, this._withCredentials)).
         then((response) => {
-      if (!validateResponseStatus(response.status, this._stream.isHttp)) {
+      if (!validateResponseStatus(response.status)) {
         throw createResponseStatusError(response.status, url);
       }
       this._readCapability.resolve();

diff --git a/src/display/network_utils.js b/src/display/network_utils.js
@@ -61,10 +61,7 @@ function createResponseStatusError(status, url) {
     ') while retrieving PDF "' + url + '".', status);
 }
 
-function validateResponseStatus(status, isHttp) {
-  if (!isHttp) {
-    return status === 0;
-  }
+function validateResponseStatus(status) {
   return status === 200 || status === 206;
 }