diff options
Diffstat (limited to 'components/script/script_module.rs')
-rw-r--r-- | components/script/script_module.rs | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/components/script/script_module.rs b/components/script/script_module.rs index 6dfb0a64ac0..9ab3a38589e 100644 --- a/components/script/script_module.rs +++ b/components/script/script_module.rs @@ -34,6 +34,7 @@ use js::rust::{ transform_str_to_source_text, CompileOptionsWrapper, Handle, HandleValue, IntoHandle, }; use mime::Mime; +use net_traits::http_status::HttpStatus; use net_traits::request::{ CredentialsMode, Destination, ParserMetadata, Referrer, RequestBuilder, RequestMode, }; @@ -1055,24 +1056,25 @@ impl FetchResponseListener for ModuleContext { FetchMetadata::Filtered { unsafe_, .. } => unsafe_, }); - let status_code = self + let status = self .metadata .as_ref() - .and_then(|m| match m.status { - Some((c, _)) => Some(c), - _ => None, - }) - .unwrap_or(0); - - self.status = match status_code { - 0 => Err(NetworkError::Internal( - "No http status code received".to_owned(), - )), - 200..=299 => Ok(()), // HTTP ok status codes - _ => Err(NetworkError::Internal(format!( - "HTTP error code {}", - status_code - ))), + .map(|m| m.status.clone()) + .unwrap_or_else(HttpStatus::new_error); + + self.status = { + if status.is_error() { + Err(NetworkError::Internal( + "No http status code received".to_owned(), + )) + } else if status.is_success() { + Ok(()) + } else { + Err(NetworkError::Internal(format!( + "HTTP error code {}", + status.code() + ))) + } }; } |