diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-10-31 21:30:52 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-10-31 21:30:52 +0530 |
| commit | f432c3c49f9fb10de12feb17329984aa66a2848d (patch) | |
| tree | c1e75b2e8a02f8db6e81345598281a27ca4e88c2 /components/script/dom/servohtmlparser.rs | |
| parent | 789aa5e3a0910c82588a9518ca57a135b2afa1fa (diff) | |
| parent | aa7a3919c4fe018fb1a85a70f51a2a0a66deace4 (diff) | |
| download | servo-f432c3c49f9fb10de12feb17329984aa66a2848d.tar.gz servo-f432c3c49f9fb10de12feb17329984aa66a2848d.zip | |
Auto merge of #7956 - gkbrk:binary_mime, r=jdm
Made binary files show an info message instead of garbled text.
Content-types with the TopLevel "Application" such as
* application/octet-stream
* application/pdf
now show an info message instead of trying to view binary data as html.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7956)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/servohtmlparser.rs')
| -rw-r--r-- | components/script/dom/servohtmlparser.rs | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/components/script/dom/servohtmlparser.rs b/components/script/dom/servohtmlparser.rs index 433c1085aef..c3ef82c9bc3 100644 --- a/components/script/dom/servohtmlparser.rs +++ b/components/script/dom/servohtmlparser.rs @@ -68,8 +68,8 @@ pub type Tokenizer = tokenizer::Tokenizer<TreeBuilder<JS<Node>, Sink>>; pub struct ParserContext { /// The parser that initiated the request. parser: Option<Trusted<ServoHTMLParser>>, - /// Is this document a synthesized document for a single image? - is_image_document: bool, + /// Is this a synthesized document + is_synthesized_document: bool, /// The pipeline associated with this document. id: PipelineId, /// The subpage associated with this document. @@ -85,7 +85,7 @@ impl ParserContext { url: Url) -> ParserContext { ParserContext { parser: None, - is_image_document: false, + is_synthesized_document: false, id: id, subpage: subpage, script_chan: script_chan, @@ -111,12 +111,12 @@ impl AsyncResponseListener for ParserContext { match content_type { Some(ContentType(Mime(TopLevel::Image, _, _))) => { - self.is_image_document = true; + self.is_synthesized_document = true; let page = format!("<html><body><img src='{}' /></body></html>", self.url.serialize()); parser.pending_input.borrow_mut().push(page); parser.parse_sync(); - } + }, Some(ContentType(Mime(TopLevel::Text, SubLevel::Plain, _))) => { // FIXME: When servo/html5ever#109 is fixed remove <plaintext> usage and // replace with fix from that issue. @@ -130,12 +130,29 @@ impl AsyncResponseListener for ParserContext { parser.pending_input.borrow_mut().push(page); parser.parse_sync(); }, - _ => {} + Some(ContentType(Mime(TopLevel::Text, SubLevel::Html, _))) => {}, // Handle text/html + Some(ContentType(Mime(toplevel, sublevel, _))) => { + if toplevel.as_str() == "application" && sublevel.as_str() == "xhtml+xml" { + // Handle xhtml (application/xhtml+xml). + return; + } + + // Show warning page for unknown mime types. + let page = format!("<html><body><p>Unknown content type ({}/{}).</p></body></html>", + toplevel.as_str(), sublevel.as_str()); + self.is_synthesized_document = true; + parser.pending_input.borrow_mut().push(page); + parser.parse_sync(); + }, + None => { + // No content-type header. + // Merge with #4212 when fixed. + } } } fn data_available(&mut self, payload: Vec<u8>) { - if !self.is_image_document { + if !self.is_synthesized_document { // FIXME: use Vec<u8> (html5ever #34) let data = UTF_8.decode(&payload, DecoderTrap::Replace).unwrap(); let parser = match self.parser.as_ref() { |