Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12)

… and libc 0.2 and many other dependencies
This commit is contained in:
Manish Goregaokar 2015-11-07 22:40:18 +05:30 committed by Josh Matthews
parent bc618b0d53
commit dc0e467945
59 changed files with 1092 additions and 978 deletions

View file

@ -22,27 +22,21 @@ git = "https://github.com/ende76/brotli-rs"
[dependencies.plugins]
path = "../plugins"
[dependencies.hyper]
version = "0.6"
features = [ "serde-serialization" ]
[dependencies.msg]
path = "../msg"
[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"
[dependencies.url]
version = "0.2"
features = [ "serde_serialization" ]
[dependencies]
hyper = { version = "0.7", features = [ "serde-serialization" ] }
log = "0.3"
time = "0.1.17"
openssl="0.6.1"
openssl = "0.7.0"
rustc-serialize = "0.3"
cookie = "0.1"
cookie = "0.2"
mime_guess = "1.1.1"
flate2 = "0.2.0"
uuid = "0.1.16"
euclid = {version = "0.3", features = ["plugins"]}
url = "0.5"

View file

@ -10,7 +10,6 @@ use mime_classifier::MIMEClassifier;
use net_traits::ProgressMsg::Done;
use net_traits::{LoadConsumer, LoadData, Metadata};
use resource_task::{CancellationListener, send_error, start_sending_sniffed_opt};
use std::fs::PathExt;
use std::sync::Arc;
use url::Url;
use util::resource_files::resources_dir_path;

View file

@ -115,7 +115,7 @@ impl Cookie {
pub fn path_match(request_path: &str, cookie_path: &str) -> bool {
request_path == cookie_path ||
( request_path.starts_with(cookie_path) &&
( request_path.ends_with("/") || request_path.as_bytes()[cookie_path.len() - 1] == b'/' )
( request_path.ends_with("/") || request_path[cookie_path.len()..].starts_with("/"))
)
}