diff options
author | George Roman <george.roman.99@gmail.com> | 2018-11-22 00:26:15 +0200 |
---|---|---|
committer | George Roman <george.roman.99@gmail.com> | 2018-11-27 19:26:40 +0200 |
commit | 73f11d69ea511d0893865617e588eec217bd86f0 (patch) | |
tree | f12edbdd0f55c26846386879673745550af0dad5 | |
parent | 524bd722ef84d0b1dff60a68102402d06affe9ab (diff) | |
download | servo-73f11d69ea511d0893865617e588eec217bd86f0.tar.gz servo-73f11d69ea511d0893865617e588eec217bd86f0.zip |
Change Response's statusText default value from 'Ok' to an empty string
-rw-r--r-- | components/net/fetch/methods.rs | 7 | ||||
-rw-r--r-- | components/net_traits/lib.rs | 2 | ||||
-rw-r--r-- | components/net_traits/response.rs | 4 | ||||
-rw-r--r-- | components/script/dom/webidls/Response.webidl | 2 | ||||
-rw-r--r-- | tests/wpt/metadata/fetch/api/response/response-clone.html.ini | 4 | ||||
-rw-r--r-- | tests/wpt/metadata/fetch/api/response/response-init-001.html.ini | 4 |
6 files changed, 11 insertions, 12 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs index 7eb963fcd5e..b98859c6a29 100644 --- a/components/net/fetch/methods.rs +++ b/components/net/fetch/methods.rs @@ -575,6 +575,8 @@ fn scheme_fetch( .headers .typed_insert(ContentType::from(mime::TEXT_HTML_UTF_8)); *response.body.lock().unwrap() = ResponseBody::Done(vec![]); + response.status = Some((StatusCode::OK, "OK".to_string())); + response.raw_status = Some((StatusCode::OK.as_u16(), b"OK".to_vec())); response }, @@ -588,6 +590,8 @@ fn scheme_fetch( Response::new(url, ResourceFetchTiming::new(request.timing_type())); *response.body.lock().unwrap() = ResponseBody::Done(bytes); response.headers.typed_insert(ContentType::from(mime)); + response.status = Some((StatusCode::OK, "OK".to_string())); + response.raw_status = Some((StatusCode::OK.as_u16(), b"OK".to_vec())); response }, Err(_) => { @@ -689,6 +693,9 @@ fn scheme_fetch( }; let mut response = Response::new(url, ResourceFetchTiming::new(request.timing_type())); + response.status = Some((StatusCode::OK, "OK".to_string())); + response.raw_status = Some((StatusCode::OK.as_u16(), b"OK".to_vec())); + if is_range_request { partial_content(&mut response); } diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs index 0cf5604de80..1dd30f031e5 100644 --- a/components/net_traits/lib.rs +++ b/components/net_traits/lib.rs @@ -534,7 +534,7 @@ impl Metadata { charset: None, headers: None, // https://fetch.spec.whatwg.org/#concept-response-status-message - status: Some((200, b"OK".to_vec())), + status: Some((200, b"".to_vec())), https_state: HttpsState::None, referrer: None, referrer_policy: None, diff --git a/components/net_traits/response.rs b/components/net_traits/response.rs index 2b9df272c4d..9a6c1226db8 100644 --- a/components/net_traits/response.rs +++ b/components/net_traits/response.rs @@ -131,8 +131,8 @@ impl Response { termination_reason: None, url: Some(url), url_list: vec![], - status: Some((StatusCode::OK, "OK".to_string())), - raw_status: Some((200, b"OK".to_vec())), + status: Some((StatusCode::OK, "".to_string())), + raw_status: Some((200, b"".to_vec())), headers: HeaderMap::new(), body: Arc::new(Mutex::new(ResponseBody::Empty)), cache_state: CacheState::None, diff --git a/components/script/dom/webidls/Response.webidl b/components/script/dom/webidls/Response.webidl index e5f2e5b71e3..eaf8fb8b066 100644 --- a/components/script/dom/webidls/Response.webidl +++ b/components/script/dom/webidls/Response.webidl @@ -27,7 +27,7 @@ Response implements Body; dictionary ResponseInit { unsigned short status = 200; - ByteString statusText = "OK"; + ByteString statusText = ""; HeadersInit headers; }; diff --git a/tests/wpt/metadata/fetch/api/response/response-clone.html.ini b/tests/wpt/metadata/fetch/api/response/response-clone.html.ini index 04d659f1567..e0cfc1152e8 100644 --- a/tests/wpt/metadata/fetch/api/response/response-clone.html.ini +++ b/tests/wpt/metadata/fetch/api/response/response-clone.html.ini @@ -44,7 +44,3 @@ [Check response clone use structureClone for teed ReadableStreams (DataViewchunk)] expected: FAIL - - [Check Response's clone with default values, without body] - expected: FAIL - diff --git a/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini b/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini index 1e5dea22adc..44593fe520c 100644 --- a/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini +++ b/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini @@ -2,7 +2,3 @@ type: testharness [Check default value for body attribute] expected: FAIL - - [Check default value for statusText attribute] - expected: FAIL - |