Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Issue #15017: Properly handle and report network errors on page loads.

Browse source
This commit is contained in:
Simon Martin 2017-01-28 21:28:36 +01:00
parent a1187c12ee
commit abc9f785e8
3 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
components/script/dom/servoparser/mod.rs
View file

@ -431,6 +431,7 @@ impl FetchResponseListener for ParserContext {
fn process_response(&mut self, meta_result: Result<FetchMetadata, NetworkError>) { fn process_response(&mut self, meta_result: Result<FetchMetadata, NetworkError>) {
let mut ssl_error = None; let mut ssl_error = None;
let mut network_error = None;
let metadata = match meta_result { let metadata = match meta_result {
Ok(meta) => { Ok(meta) => {
Some(match meta { Some(match meta {
@ -445,6 +446,13 @@ impl FetchResponseListener for ParserContext {
meta.set_content_type(mime.as_ref()); meta.set_content_type(mime.as_ref());
Some(meta) Some(meta)
}, },
Err(NetworkError::Internal(reason)) => {
network_error = Some(reason);
let mut meta = Metadata::default(self.url.clone());
let mime: Option<Mime> = "text/html".parse().ok();
meta.set_content_type(mime.as_ref());
Some(meta)
},
Err(_) => None, Err(_) => None,
}; };
let content_type = metadata.clone().and_then(|meta| meta.content_type).map(Serde::into_inner); let content_type = metadata.clone().and_then(|meta| meta.content_type).map(Serde::into_inner);
@ -486,6 +494,14 @@ impl FetchResponseListener for ParserContext {
parser.push_input_chunk(page); parser.push_input_chunk(page);
parser.parse_sync(); parser.parse_sync();
} }
if let Some(reason) = network_error {
self.is_synthesized_document = true;
let page_bytes = read_resource_file("neterror.html").unwrap();
let page = String::from_utf8(page_bytes).unwrap();
let page = page.replace("${reason}", &reason);
parser.push_input_chunk(page);
parser.parse_sync();
}
}, },
Some(ContentType(Mime(TopLevel::Text, SubLevel::Xml, _))) => {}, // Handle text/xml Some(ContentType(Mime(TopLevel::Text, SubLevel::Xml, _))) => {}, // Handle text/xml
Some(ContentType(Mime(toplevel, sublevel, _))) => { Some(ContentType(Mime(toplevel, sublevel, _))) => {
@ -527,16 +543,7 @@ impl FetchResponseListener for ParserContext {
None => return, None => return,
}; };
if let Err(NetworkError::Internal(ref reason)) = status { if let Err(err) = status {
// Show an error page for network errors,
// certificate errors are handled earlier.
self.is_synthesized_document = true;
let page_bytes = read_resource_file("neterror.html").unwrap();
let page = String::from_utf8(page_bytes).unwrap();
let page = page.replace("${reason}", reason);
parser.push_input_chunk(page);
parser.parse_sync();
} else if let Err(err) = status {
// TODO(Savago): we should send a notification to callers #5463. // TODO(Savago): we should send a notification to callers #5463.
debug!("Failed to load page URL {}, error: {:?}", self.url, err); debug!("Failed to load page URL {}, error: {:?}", self.url, err);
} }

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -8768,6 +8768,12 @@
"url": "/_mozilla/mozilla/nested_asap_script.html" "url": "/_mozilla/mozilla/nested_asap_script.html"
} }
], ],
"mozilla/network_error_page_load.html": [
{
"path": "mozilla/network_error_page_load.html",
"url": "/_mozilla/mozilla/network_error_page_load.html"
}
],
"mozilla/node_compareDocumentPosition.html": [ "mozilla/node_compareDocumentPosition.html": [
{ {
"path": "mozilla/node_compareDocumentPosition.html", "path": "mozilla/node_compareDocumentPosition.html",

13
tests/wpt/mozilla/tests/mozilla/network_error_page_load.html Normal file
View file

@ -0,0 +1,13 @@
<!doctype html>
<meta charset="utf-8">
<title>Test for issue #15017</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<html>
<iframe src="http://aowiejfoiawjef" id="foo"></iframe>
</html>
<script>
var t = async_test("Load resource with network error")
var iframe = document.getElementById('foo')
iframe.onload = t.step_func(function(e) { t.done() })
</script>