summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorhoro <horo@chromium.org>2014-09-22 15:57:21 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-22 22:57:34 +0000
commit8faf94721b6ec90f92404234f0c227e2e501c102 (patch)
treec1bc08a2f3b8e7a7827e24fa88674b082d3b841f /content/browser
parent91621ea4d15d8ab32dafb624b7d0a9f60f0c406e (diff)
downloadchromium_src-8faf94721b6ec90f92404234f0c227e2e501c102.zip
chromium_src-8faf94721b6ec90f92404234f0c227e2e501c102.tar.gz
chromium_src-8faf94721b6ec90f92404234f0c227e2e501c102.tar.bz2
[ServiceWorker] Treat the rejected result of onFetch event as a Network Error.
In current code the rejected result of onFetch event is treated as 500 respose. But it should be treated as a Network Error. Step1: [ServiceWorker] Remove the test for the rejected result of FetchEvent from fetch-event.html https://codereview.chromium.org/588993002/ Step2: this patch [ServiceWorker] Treat the rejected result of onFetch as a Network Error. https://codereview.chromium.org/590043002/ Step3: [ServiceWorker] Add test for the rejected result of FetchEvent using XHR. https://codereview.chromium.org/588093003/ BUG=411173 Review URL: https://codereview.chromium.org/590043002 Cr-Commit-Position: refs/heads/master@{#296080}
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/service_worker/service_worker_url_request_job.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/service_worker/service_worker_url_request_job.cc b/content/browser/service_worker/service_worker_url_request_job.cc
index e74767d..2b57e74 100644
--- a/content/browser/service_worker/service_worker_url_request_job.cc
+++ b/content/browser/service_worker/service_worker_url_request_job.cc
@@ -18,6 +18,7 @@
#include "content/common/service_worker/service_worker_types.h"
#include "content/public/browser/blob_handle.h"
#include "content/public/browser/resource_request_info.h"
+#include "net/base/net_errors.h"
#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/http/http_response_info.h"
@@ -380,9 +381,10 @@ void ServiceWorkerURLRequestJob::DidDispatchFetchEvent(
// We should have a response now.
DCHECK_EQ(SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE, fetch_result);
- // Treat a response whose status is 0 as an error.
+ // Treat a response whose status is 0 as a Network Error.
if (response.status_code == 0) {
- DeliverErrorResponse();
+ NotifyDone(
+ net::URLRequestStatus(net::URLRequestStatus::FAILED, net::ERR_FAILED));
return;
}