Fixes for issue #7347

This commit is contained in:
Sara Tang 2015-08-24 21:32:16 -04:00
parent b1f0357fce
commit f80ae3402a

View file

@ -277,22 +277,22 @@ impl MIMEChecker for Mp4Matcher {
struct BinaryOrPlaintextClassifier;
impl BinaryOrPlaintextClassifier {
fn classify_impl(&self, data: &[u8]) -> Option<(&'static str, &'static str)> {
fn classify_impl(&self, data: &[u8]) -> (&'static str, &'static str) {
if (data.len() >= 2 &&
((data[0] == 0xFFu8 && data[1] == 0xFEu8) ||
(data[0] == 0xFEu8 && data[1] == 0xFFu8))) ||
(data.len() >= 3 && data[0] == 0xEFu8 && data[1] == 0xBBu8 && data[2] == 0xBFu8)
{
Some(("text", "plain"))
("text", "plain")
}
else if data.len() >= 1 && data.iter().any(|&x| x <= 0x08u8 ||
x == 0x0Bu8 ||
(x >= 0x0Eu8 && x <= 0x1Au8) ||
(x >= 0x1Cu8 && x <= 0x1Fu8)) {
Some(("application", "octet-stream"))
("application", "octet-stream")
}
else {
Some(("text", "plain"))
("text", "plain")
}
}
}