Navigation Menu

Skip to content

Commit

Permalink
Instead of panicking on broken url, break from the loop and return.
Browse files Browse the repository at this point in the history
  • Loading branch information
Adenilson authored and Ms2ger committed Apr 1, 2015
1 parent d74e633 commit 4e9bb15
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 3 additions & 1 deletion components/script/parse/html.rs
Expand Up @@ -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,
}
Expand Down
@@ -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
Copy link
Contributor

@Ms2ger Ms2ger commented on 4e9bb15 Apr 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=jdm

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jdm
at 4e9bb15

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 6824bc9

Please sign in to comment.