Skip to content
Permalink
Browse files

Instead of panicking on broken url, break from the loop and return.

  • Loading branch information
Adenilson authored and Ms2ger committed Apr 1, 2015
1 parent d74e633 commit 4e9bb15ba73fa3a1c8a744003042fc29a9489bc1
@@ -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,
}
@@ -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
@@ -1,3 +1,6 @@
[window-security.sub.html]
type: testharness
expected: CRASH
expected: TIMEOUT
[Window Security testing]
expected: NOTRUN

6 comments on commit 4e9bb15

@Ms2ger

This comment has been minimized.

Copy link
Contributor

@Ms2ger Ms2ger replied Apr 1, 2015

r=jdm

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Apr 1, 2015

saw approval from jdm
at 4e9bb15

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Apr 1, 2015

merging servo/servo/load-failure-panic = 4e9bb15 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Apr 1, 2015

servo/servo/load-failure-panic = 4e9bb15 merged ok, testing candidate = 6824bc9

@bors-servo

This comment has been minimized.

Copy link
Contributor

@bors-servo bors-servo replied Apr 1, 2015

fast-forwarding master to auto = 6824bc9

Please sign in to comment.
You can’t perform that action at this time.