Made binary files show an info message instead of garbled text. #7956

gkbrk · 2015-10-10T13:37:14Z

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.

highfive · 2015-10-10T13:37:20Z

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @pcwalton (or someone else) soon.

gkbrk · 2015-10-10T13:40:17Z

This should solve #7706 I think.

jdm · 2015-10-10T15:33:03Z

Thanks for doing this work!
-S-awaiting-review +S-needs-code-changes

Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, 2 unresolved discussions, some commit checks pending.

^{components/script/dom/servohtmlparser.rs, line 135 [r1] (raw file):}
This does solve the problem, but I think we should move to a whitelisting model instead, ie. only continue parsing HTML for text/html, and display this for all others that we don't explicitly support.

^{components/script/dom/servohtmlparser.rs, line 136 [r1] (raw file):}
Let's rename this to is_synthesized_content.

Comments from the review on Reviewable.io

jdm · 2015-10-10T22:15:48Z

-S-awaiting-review +S-needs-code-changes

Reviewed 1 of 1 files at r2.
Review status: all files reviewed at latest revision, 1 unresolved discussion, some commit checks pending.

^{components/script/dom/servohtmlparser.rs, line 142 [r2] (raw file):}
This should be a None branch with a comment that it should be merged with the previous branch when #4212 is fixed.

Comments from the review on Reviewable.io

gkbrk · 2015-10-11T16:22:57Z

@jdm anything else I should change?

jdm · 2015-10-12T04:00:12Z

Nope! Just squash these three commits into one and we're good to merge!
-S-awaiting-review -S-fails-tidy +S-needs-squash

Reviewed 1 of 1 files at r3, 1 of 1 files at r4.
Review status: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io

gkbrk · 2015-10-12T14:36:52Z

@jdm I might have done the squash incorrectly, doesn't seem like there's a problem though.

jdm · 2015-10-12T14:53:34Z

@bors-servo: r+
Lovely!

bors-servo · 2015-10-12T14:53:34Z

📌 Commit 93721d8 has been approved by jdm

bors-servo · 2015-10-12T15:47:05Z

⌛ Testing commit 93721d8 with merge db04716...


        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.  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7956)

bors-servo · 2015-10-12T16:12:09Z

💔 Test failed - linux-rel

jdm · 2015-10-12T17:46:59Z

Ah, presumably the server is giving us text/xhtml for .xhtml files. We should probably claim that we can deal with those, even though we don't have an XML parser yet.

gkbrk · 2015-10-12T19:18:17Z

@jdm So I'm adding text/xhtml to the match statement right?

gkbrk · 2015-10-12T19:29:56Z

@jdm http://www.w3.org/International/articles/serving-xhtml/ says xhtml has 3 possible mime types.

application/xhtml+xml
application/xml
text/xml

Which ones should I add?

eefriedman · 2015-10-12T19:35:17Z

Hopefully just application/xhtml+xml is sufficient. Treating arbitrary text/xml as HTML is likely to lead to weird results.

bors-servo · 2015-10-16T16:14:03Z

☔ The latest upstream changes (presumably #8051) made this pull request unmergeable. Please resolve the merge conflicts.

Manishearth · 2015-10-31T11:01:47Z

Any updates?


        Made binary files show an info message instead of garbled text.

gkbrk · 2015-10-31T15:09:00Z

@jdm @Manishearth Just updated the PR to compile and hopefully pass the xhtml tests.

jdm · 2015-10-31T15:56:17Z

@bors-servo: r+
Thanks!

bors-servo · 2015-10-31T15:56:18Z

📌 Commit aa7a391 has been approved by jdm

bors-servo · 2015-10-31T16:00:54Z

⌛ Testing commit aa7a391 with merge f432c3c...


        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.  [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7956)

bors-servo · 2015-10-31T16:39:36Z

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt

highfive added the S-awaiting-review label Oct 10, 2015

jdm self-assigned this Oct 10, 2015

jdm added S-needs-code-changes and removed S-awaiting-review labels Oct 10, 2015

highfive added S-awaiting-review and removed S-needs-code-changes labels Oct 10, 2015

jdm added S-needs-code-changes and removed S-awaiting-review labels Oct 10, 2015

jdm added the S-fails-tidy label Oct 10, 2015

highfive added S-awaiting-review and removed S-needs-code-changes labels Oct 11, 2015

jdm added S-needs-squash and removed S-fails-tidy S-awaiting-review labels Oct 12, 2015

highfive added the S-awaiting-review label Oct 12, 2015

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-squash labels Oct 12, 2015

highfive added S-tests-failed and removed S-awaiting-merge labels Oct 12, 2015

highfive added S-needs-rebase and removed S-awaiting-merge labels Oct 16, 2015

eefriedman added S-needs-code-changes and removed S-tests-failed labels Oct 29, 2015

Made binary files show an info message instead of garbled text.

Loading status checks…

aa7a391

highfive added S-awaiting-review and removed S-needs-code-changes labels Oct 31, 2015

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Oct 31, 2015

jdm mentioned this pull request Nov 17, 2015

Don't interpret binary files as HTML #7706

Closed

servo / servo

Made binary files show an info message instead of garbled text. #7956

Made binary files show an info message instead of garbled text. #7956

gkbrk commented Oct 10, 2015

highfive commented Oct 10, 2015

gkbrk commented Oct 10, 2015

jdm commented Oct 10, 2015

jdm commented Oct 10, 2015

gkbrk commented Oct 11, 2015

jdm commented Oct 12, 2015

gkbrk commented Oct 12, 2015

jdm commented Oct 12, 2015

bors-servo commented Oct 12, 2015

bors-servo commented Oct 12, 2015

bors-servo commented Oct 12, 2015

jdm commented Oct 12, 2015

gkbrk commented Oct 12, 2015

gkbrk commented Oct 12, 2015

eefriedman commented Oct 12, 2015

bors-servo commented Oct 16, 2015

Manishearth commented Oct 31, 2015

gkbrk commented Oct 31, 2015

jdm commented Oct 31, 2015

bors-servo commented Oct 31, 2015

bors-servo commented Oct 31, 2015

bors-servo commented Oct 31, 2015

servo / servo

Join GitHub today

Made binary files show an info message instead of garbled text. #7956

Made binary files show an info message instead of garbled text. #7956

Conversation

gkbrk commented Oct 10, 2015

highfive commented Oct 10, 2015

gkbrk commented Oct 10, 2015

jdm commented Oct 10, 2015

jdm commented Oct 10, 2015

gkbrk commented Oct 11, 2015

jdm commented Oct 12, 2015

gkbrk commented Oct 12, 2015

jdm commented Oct 12, 2015

bors-servo commented Oct 12, 2015

bors-servo commented Oct 12, 2015

bors-servo commented Oct 12, 2015

jdm commented Oct 12, 2015

gkbrk commented Oct 12, 2015

gkbrk commented Oct 12, 2015

eefriedman commented Oct 12, 2015

bors-servo commented Oct 16, 2015

Manishearth commented Oct 31, 2015

gkbrk commented Oct 31, 2015

jdm commented Oct 31, 2015

bors-servo commented Oct 31, 2015

bors-servo commented Oct 31, 2015

bors-servo commented Oct 31, 2015