From 1dbbc1b72da85d9c14ba103f8a4db6c4f3536877 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 2 Feb 2015 16:53:48 +0000 Subject: [PATCH] Use servo forks of hyper and cookie-rs for more lenient cookie parsing behaviour. --- components/msg/Cargo.toml | 4 ++-- components/net/Cargo.toml | 7 +++++-- components/script/Cargo.toml | 4 ++-- components/servo/Cargo.lock | 14 +++++++------- ports/cef/Cargo.lock | 13 +++++++------ 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index 9ffd1d65f0e..289c65edd52 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -22,7 +22,7 @@ git = "https://github.com/servo/rust-geom" [dependencies.hyper] git = "https://github.com/servo/hyper" -branch = "servo" +branch = "old_servo_new_cookies" [dependencies.layers] git = "https://github.com/servo/rust-layers" @@ -34,4 +34,4 @@ git = "https://github.com/servo/rust-core-foundation" git = "https://github.com/servo/rust-io-surface" [dependencies] -url = "0.2.16" \ No newline at end of file +url = "0.2.16" diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 9a597c876a3..8e31f9b5cfa 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -15,7 +15,11 @@ git = "https://github.com/servo/rust-geom" [dependencies.hyper] git = "https://github.com/servo/hyper" -branch = "servo" +branch = "old_servo_new_cookies" + +[dependencies.cookie] +git = "https://github.com/servo/cookie-rs" +branch = "lenientparse_backport" [dependencies.png] git = "https://github.com/servo/rust-png" @@ -27,4 +31,3 @@ git = "https://github.com/servo/rust-stb-image" url = "0.2.16" time = "0.1.12" openssl="0.2.15" -cookie = "*" diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index e0b98db4f4b..8b4d56891be 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -50,7 +50,7 @@ git = "https://github.com/servo/html5ever" [dependencies.hyper] git = "https://github.com/servo/hyper" -branch = "servo" +branch = "old_servo_new_cookies" [dependencies.js] git = "https://github.com/servo/rust-mozjs" @@ -67,4 +67,4 @@ git = "https://github.com/servo/string-cache" [dependencies] encoding = "0.2" url = "0.2.16" -time = "0.1.12" \ No newline at end of file +time = "0.1.12" diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index fc4c32d8d59..f799f63a952 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -100,7 +100,7 @@ dependencies = [ [[package]] name = "cookie" version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/servo/cookie-rs?branch=lenientparse_backport#47ffa4d3c6f85d28f222d6e1d54635fff5622ea3" dependencies = [ "openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -399,9 +399,9 @@ source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07 [[package]] name = "hyper" version = "0.1.1" -source = "git+https://github.com/servo/hyper?branch=servo#7f48a7e945180a4f762dc75236210d20a69b4a6a" +source = "git+https://github.com/servo/hyper?branch=old_servo_new_cookies#7a346f481d683705709526594aa5f13b5c923bc1" dependencies = [ - "cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.1.8 (git+https://github.com/servo/cookie-rs?branch=lenientparse_backport)", "log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "mucell 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -542,7 +542,7 @@ dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=servo)", + "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "style 0.0.1", @@ -559,9 +559,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "net" version = "0.0.1" dependencies = [ - "cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.1.8 (git+https://github.com/servo/cookie-rs?branch=lenientparse_backport)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=servo)", + "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)", "openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", @@ -657,7 +657,7 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", - "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=servo)", + "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "msg 0.0.1", "net 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 7aba998457c..1b45aa7eed3 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -99,7 +99,7 @@ dependencies = [ [[package]] name = "cookie" version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/servo/cookie-rs?branch=lenientparse_backport#47ffa4d3c6f85d28f222d6e1d54635fff5622ea3" dependencies = [ "openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -398,9 +398,9 @@ source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07 [[package]] name = "hyper" version = "0.1.1" -source = "git+https://github.com/servo/hyper?branch=servo#7f48a7e945180a4f762dc75236210d20a69b4a6a" +source = "git+https://github.com/servo/hyper?branch=old_servo_new_cookies#7a346f481d683705709526594aa5f13b5c923bc1" dependencies = [ - "cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cookie 0.1.8 (git+https://github.com/servo/cookie-rs?branch=lenientparse_backport)", "log 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "mucell 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -541,7 +541,7 @@ dependencies = [ "azure 0.1.0 (git+https://github.com/servo/rust-azure)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=servo)", + "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "style 0.0.1", @@ -558,8 +558,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "net" version = "0.0.1" dependencies = [ + "cookie 0.1.8 (git+https://github.com/servo/cookie-rs?branch=lenientparse_backport)", "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=servo)", + "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)", "openssl 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", @@ -655,7 +656,7 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "gfx 0.0.1", "html5ever 0.0.0 (git+https://github.com/servo/html5ever)", - "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=servo)", + "hyper 0.1.1 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "msg 0.0.1", "net 0.0.1",