aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/httpBackend.js
diff options
context:
space:
mode:
authorPawel Kozlowski2014-03-01 12:49:47 +0100
committerVojta Jina2014-03-14 13:44:56 -0700
commit56e73ea355c851fdfd574d6d2a9e2fcb75677945 (patch)
tree38c360d35f0fed36e353f04f1792bc27592e5186 /src/ng/httpBackend.js
parentbfb6af7053f3f3949e97eb074c11d907d1534a89 (diff)
downloadangular.js-56e73ea355c851fdfd574d6d2a9e2fcb75677945.tar.bz2
fix($http): don't covert 0 status codes to 404 for non-file protocols
PR #5547 introduced conversion of all 0 status codes to 404 for cases where no response was recieved (previously this was done for the file:// protocol only). But this mechanism is too eager and masks legitimate cases where status 0 should be returned. This commits reverts to the previous mechanism of handling 0 status code for the file:// protocol (converting 0 to 404) while retaining the returned status code 0 for all the protocols other than file:// Fixes #6074 Fixes #6155
Diffstat (limited to 'src/ng/httpBackend.js')
-rw-r--r--src/ng/httpBackend.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js
index ee2a37fe..28107966 100644
--- a/src/ng/httpBackend.js
+++ b/src/ng/httpBackend.js
@@ -144,9 +144,11 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
jsonpDone = xhr = null;
// fix status code when it is 0 (0 status is undocumented).
- // Occurs when accessing file resources.
- // On Android 4.1 stock browser it occurs while retrieving files from application cache.
- status = (status === 0) ? (response ? 200 : 404) : status;
+ // Occurs when accessing file resources or on Android 4.1 stock browser
+ // while retrieving files from application cache.
+ if (status === 0) {
+ status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0;
+ }
// normalize IE bug (http://bugs.jquery.com/ticket/1450)
status = status == 1223 ? 204 : status;