Commit Graph

17 Commits

Author SHA1 Message Date
Corey Farwell
d77ea9cde2 servo: Merge #13411 - Migrate mime_classifier top-level string to enum (from frewsxcv:mime); r=jdm
I made this branch months ago and forgot about it. Instead of just throwing the changes away, I rebased off origin/master and opened this pull request. If these changes aren't desired, no feelings hurt, just close this. If they are desired, let me know if there are any changes you want me to make and I'll also need to rewrite/squash the commits.

Source-Repo: https://github.com/servo/servo
Source-Revision: b1d8eff467d3c324e0cc729b06983931000c2680
2016-10-08 15:40:47 -05:00
Corey Farwell
7a3f1074bb servo: Merge #13652 - Fix capitalization for enum variants (from frewsxcv:variant-naming); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3768ea2cc735a90e22d716d94100305382d17f1b
2016-10-08 14:55:24 -05:00
UK992
a6ebcb8483 servo: Merge #13205 - Tidy: Fix ordering use statements with braces (from UK992:tidy-sort); r=Wafflespeanut
This hack fixes https://github.com/servo/servo/issues/7412 and matches behavior with rustfmt.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3117787fd2a8b7748cfde1e9b8c5be3c00f2c599
2016-09-08 22:19:19 -05:00
Corey Farwell
a8fa1bc48e servo: Merge #12190 - Minor MIME renaming and aliasing cleanup (from frewsxcv:mime-renaming); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 194fb3e199922ef0e1ce7943036800ecac5bbfe3
2016-07-03 11:07:12 -07:00
Jonathan Giddy
b0ecc37e18 servo: Merge #9631 - Validate MIME pattern checking (from jongiddy:remove-extra-mask-byte); r=jdm
The MIME detector for a HTML file contains an additional byte in the mask.  While it doesn't hurt, it is not used in the byte matching code (since it is zipped with the `pattern` iterator).

I'm not clear how to test this within the `servo` code. The fix doesn't change any externally visible behavior. A test to validate the `ByteMatcher` structures would require the private ByteMatcher structures to be visible to the test. I could use a sub-module, as described at https://doc.rust-lang.org/book/testing.html#the-tests-module but this pattern doesn't appear anywhere else in the `servo` code.

Source-Repo: https://github.com/servo/servo
Source-Revision: 32c97b6c8d69a284a0f5a30bd68c9b8a8d00b204
2016-02-26 02:27:44 +05:00
Jonathan Giddy
054becb2de servo: Merge #9618 - Calculate correct mp4 header length (from jongiddy:fix-mp4-size); r=jdm
The calculation of MP4 frame length is incorrect, shifting values by 1 bit instead of 8 bits.  It works for the test MP4 file because the length of the frame is less than 256 bytes, so the shifted values are all zero.

This PR changes the code to calculate the length correctly. It adds a test to check a fake long stream. Still not long enough to test completely, but at least detects the problem with the original code.

Source-Repo: https://github.com/servo/servo
Source-Revision: 520ca258d4f979500f839e13a278bee35bfcc00a
2016-02-13 00:50:58 +05:00
Josh Matthews
756e838b8c servo: Merge #8190 - Implemementing context-based MIME type sniffing (from jdm:4138); r=eefriedman
This is a rebase of #7842 that also adds a test.
Fixes #4183.

@Yoric, how's this look to you?

Source-Repo: https://github.com/servo/servo
Source-Revision: af1690f3036bc329101bbd6f4e877672d58ca5e0
2015-12-31 20:43:10 +05:00
Eli Friedman
f0e2ee150d servo: Merge #7967 - MIMEClassifier::classify always succeeds; fix the type to reflect this (from eefriedman:mime-handling); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 7308d0dd0d2f41e140434d5f992c5aa7ecc0ef71
2015-10-14 08:46:32 -06:00
Mathieu Rheaume
144797d536 servo: Merge #7447 - Issue #7382 Use descriptive enums instead of booleans for MIMEClassifier::classifer (from ddrmanxbxfr:master); r=jdm
Hi guys i've done a small pass of refactor in the MIMEClassifier implementation. (See issue #7382 )
   - Moved the predicates to separate functions
   - Added a mimetype enum so we can compare them easily after calling MIMEClassifier::get_media_type

I hope it follows rust good pratices (care it's my first time doing rust).

Improvements and tips are welcome :).

Thanks for looking at it.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8a8204ffc8fa287dde2321c40d12b191b51960da
2015-09-18 07:22:59 -06:00
Simon Martin
77ff67ca17 servo: Merge #7449 - Issue #7393: Properly sniff mislabeled feeds (from simartin:issue_7393); r=metajack
Hi,

This patch is an attempt to fix https://github.com/servo/servo/issues/7393, where the code detecting mislabeled feeds (see https://mimesniff.spec.whatwg.org/#sniffing-a-mislabeled-feed) had spurious space in the URLs we need to match.

Note that my testing (in particular rdf_rss_ko_2.xml) highlighted a flaw in "matches", that failed to check that there were more bytes in the string being checked than in the string we're checking against, which completely broke the whole step 5.2.7.

Thanks in advance for your review.

Cheers,
  Simon

Source-Repo: https://github.com/servo/servo
Source-Revision: 9f85370885c84ebb58cd7f4a72a6e78948f468dc
2015-09-01 11:22:52 -06:00
Johann Tuffe
25ce9ab4be servo: Merge #7265 - Add alphabetical order check for use statements (from tafia:tidy-use); r=Ms2ger
close #7112

Source-Repo: https://github.com/servo/servo
Source-Revision: a5fbb2f2a6fa79755f975feff2435abb6a5dd0e9
2015-08-20 07:43:56 -06:00
Josh Matthews
d1f1ba555f servo: Merge #7203 - Add automated style nit checks to test-tidy (from jdm:style); r=Ms2ger
Expands on the work by @wilmoz and cleans up the existing errors. Closes #7180. Closes #7111.

Source-Repo: https://github.com/servo/servo
Source-Revision: e74825f9fde8e222f4ba9bb24b2c2a3864c73e5f
2015-08-16 08:37:40 -06:00
Simon Sapin
b72bb5e7d5 servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
r? everybody

Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Simon Sapin
d713c2ab5a servo: Merge #5776 - Split the unit tests crate (from servo:split-unit-tests); r=mbrubeck
Closes #5707. (Includes a rebase of it.)
Fixes #5688.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: f795440ee3be976d9819b011d4add7ceee3ade1e
2015-04-21 14:06:22 -05:00
Marcus Klaas
3d3a993842 servo: Merge #5734 - Fix compiler warnings in net unit tests (from marcusklaas:issue-5709); r=jdm
This closes issue https://github.com/servo/servo/issues/5709.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2b3acd1f5d3bcbbb796b3552a17e64cdc756a0d0
2015-04-17 09:52:46 -05:00
Ms2ger
9a5eaacd70 servo: Merge #5710 - Retire content tests (from Ms2ger:content); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 53d2432c90ab9ef171dfbef8e22ed3f58fcef8f0
2015-04-16 05:41:56 -05:00
Edward Cho
c2bdc73673 servo: Merge #5671 - move mime classifier unit tests into unit test crate (from zerokarmaleft:move_mime_classifier_tests); r=SimonSapin
Closes #5667.

Source-Repo: https://github.com/servo/servo
Source-Revision: f67749fc7d9eab13086fbea32b684f3a8eff6688
2015-04-13 16:11:10 -05:00