cookie-rs_Cargo.toml

[dependencies]
openssl = "0.2"
url = "0.2"
time = "0.1"
rustc-serialize = "0.2"

hyper_Cargo.toml

[dependencies.cookie]
git = "https://github.com/servo/cookie-rs"
branch = "lenientparse_backport"

[dependencies]
log = "*"
mime = "*"
mucell = "*"
openssl = "*"
rustc-serialize = "*"
time = "*"
unicase = "*"
unsafe-any = "*"
url = "*"

servo diff

diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 2bd5534..91f77b7 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"
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 9fbd38b..bcf5cdc 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"
@@ -25,5 +29,4 @@ git = "https://github.com/servo/rust-stb-image"
 
 [dependencies]
 url = "*"
-time = "*"
-cookie = "*"
\ No newline at end of file
+time = "*"
\ No newline at end of file
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 08c5cc7..460cca9 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"
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 568ed06..83e6dc9 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -101,7 +101,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#d82f74dcdfa07d654e7aea124cff6b1f863dcbfd"
 dependencies = [
  "openssl 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -429,9 +429,9 @@ source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07
 [[package]]
 name = "hyper"
 version = "0.1.0"
-source = "git+https://github.com/servo/hyper?branch=servo#248a6f29086baa841eb30c88540dca3196accae4"
+source = "git+https://github.com/servo/hyper?branch=old_servo_new_cookies#82d91b9c0e9ff1730046d48b874ba4eaf97fc77d"
 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)",
@@ -566,7 +566,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (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",
@@ -583,9 +583,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)",
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
  "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -680,7 +680,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (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 8ca652f..bc980c5 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -99,6 +99,17 @@ dependencies = [
 [[package]]
 name = "cookie"
 version = "0.1.8"
+source = "git+https://github.com/servo/cookie-rs?branch=lenientparse_backport#d82f74dcdfa07d654e7aea124cff6b1f863dcbfd"
+dependencies = [
+ "openssl 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cookie"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "openssl 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -397,9 +408,9 @@ source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07
 [[package]]
 name = "hyper"
 version = "0.1.0"
-source = "git+https://github.com/servo/hyper?branch=servo#248a6f29086baa841eb30c88540dca3196accae4"
+source = "git+https://github.com/servo/hyper?branch=old_servo_new_cookies#82d91b9c0e9ff1730046d48b874ba4eaf97fc77d"
 dependencies = [
- "cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
@@ -534,7 +545,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (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",
@@ -551,8 +562,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)",
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
  "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -647,7 +659,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (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/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 8f133b6..c81960d 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -70,6 +70,17 @@ dependencies = [
 [[package]]
 name = "cookie"
 version = "0.1.8"
+source = "git+https://github.com/servo/cookie-rs?branch=lenientparse_backport#d82f74dcdfa07d654e7aea124cff6b1f863dcbfd"
+dependencies = [
+ "openssl 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cookie"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "openssl 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -321,9 +332,9 @@ source = "git+https://github.com/servo/html5ever#d35dfaaf0d85007057a299afc370d07
 [[package]]
 name = "hyper"
 version = "0.1.0"
-source = "git+https://github.com/servo/hyper?branch=servo#248a6f29086baa841eb30c88540dca3196accae4"
+source = "git+https://github.com/servo/hyper?branch=old_servo_new_cookies#82d91b9c0e9ff1730046d48b874ba4eaf97fc77d"
 dependencies = [
- "cookie 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
@@ -453,7 +464,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (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",
@@ -470,8 +481,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (git+https://github.com/servo/hyper?branch=old_servo_new_cookies)",
  "png 0.1.0 (git+https://github.com/servo/rust-png)",
  "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
  "time 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -566,7 +578,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.0 (git+https://github.com/servo/hyper?branch=servo)",
+ "hyper 0.1.0 (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",

servo_net_Cargo.toml

[dependencies.hyper]
git = "https://github.com/servo/hyper"
branch = "old_servo_new_cookies"

[dependencies.cookie]
git = "https://github.com/servo/cookie-rs"
branch = "lenientparse_backport"

[dependencies]
url = "*"

godot2:servo jdm$ ./mach build
Updating git repository https://github.com/servo/cookie-rs
Updating git repository https://github.com/servo/rust-url
Updating git repository https://github.com/sfackler/rust-openssl
Updating git repository https://github.com/rust-lang/time
no package named url found (required by cookie)
location searched: https://github.com/servo/rust-url
version required: ^0.1.0
Build completed in 1.79s