aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-07-24 03:07:26 -0700
committerGitHub <noreply@github.com>2017-07-24 03:07:26 -0700
commita56bd4663b30e3a5722d095b412b4340cf695cac (patch)
treed60d8f0a9580c3855716b5563d32d51d6b6b9d81
parent30d6d6024bd0a082424395621f620dc9580970e5 (diff)
parent19cf006d4f18c6c86cd4bbc3e02253c5638c88f5 (diff)
downloadservo-a56bd4663b30e3a5722d095b412b4340cf695cac.tar.gz
servo-a56bd4663b30e3a5722d095b412b4340cf695cac.zip
Auto merge of #17835 - KiChjang:clearer-network-error, r=emilio
Make network error messages more specific Instead of having a bogus "Network error" string, we extract the NetworkError struct from the Response and send it back to FetchResponseListener. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17835) <!-- Reviewable:end -->
-rw-r--r--components/net_traits/lib.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index 8cece70866a..7e841fd645b 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -228,10 +228,8 @@ impl FetchTaskTarget for IpcSender<FetchResponseMsg> {
}
fn process_response_eof(&mut self, response: &Response) {
- if response.is_network_error() {
- // todo: finer grained errors
- let _ =
- self.send(FetchResponseMsg::ProcessResponseEOF(Err(NetworkError::Internal("Network error".into()))));
+ if let Some(e) = response.get_network_error() {
+ let _ = self.send(FetchResponseMsg::ProcessResponseEOF(Err(e.clone())));
} else {
let _ = self.send(FetchResponseMsg::ProcessResponseEOF(Ok(())));
}