diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-01 07:51:46 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-01 07:51:46 -0600 |
| commit | 6824bc93241d8ad6eff30e5014d27b88ea8a65d7 (patch) | |
| tree | 622569c6b68003567a8b4f776caa9d724e4e7bac | |
| parent | f25604c7f1711ae1218552e529535edc7a60acb2 (diff) | |
| parent | 4e9bb15ba73fa3a1c8a744003042fc29a9489bc1 (diff) | |
| download | servo-6824bc93241d8ad6eff30e5014d27b88ea8a65d7.tar.gz servo-6824bc93241d8ad6eff30e5014d27b88ea8a65d7.zip | |
auto merge of #5476 : servo/servo/load-failure-panic, r=jdm
Fixes #5365.
3 files changed, 11 insertions, 3 deletions
diff --git a/components/script/parse/html.rs b/components/script/parse/html.rs index ce7b75f9338..3fc60d8c7c8 100644 --- a/components/script/parse/html.rs +++ b/components/script/parse/html.rs @@ -274,7 +274,9 @@ pub fn parse_html(document: JSRef<Document>, parser.parse_chunk(data); } ProgressMsg::Done(Err(err)) => { - panic!("Failed to load page URL {}, error: {}", url.serialize(), err); + debug!("Failed to load page URL {}, error: {}", url.serialize(), err); + // TODO(Savago): we should send a notification to callers #5463. + break; } ProgressMsg::Done(Ok(())) => break, } diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini index 71a53f995de..a09e291d45b 100644 --- a/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini +++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/security_location_0.sub.htm.ini @@ -1,3 +1,6 @@ [security_location_0.sub.htm] type: testharness - expected: CRASH + expected: TIMEOUT + [Accessing location object from different origins doesn\'t raise SECURITY_ERR exception] + expected: NOTRUN + diff --git a/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini index 047d3a00e60..b5a20e9a276 100644 --- a/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini +++ b/tests/wpt/metadata/html/browsers/the-window-object/security-window/window-security.sub.html.ini @@ -1,3 +1,6 @@ [window-security.sub.html] type: testharness - expected: CRASH + expected: TIMEOUT + [Window Security testing] + expected: NOTRUN + |