diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml index c951e5cc5d92..21312f5d4810 100644 --- a/components/msg/Cargo.toml +++ b/components/msg/Cargo.toml @@ -18,7 +18,7 @@ git = "https://github.com/servo/rust-azure" git = "https://github.com/servo/rust-geom" [dependencies.hyper] -git = "https://github.com/hyperium/hyper" +git = "https://github.com/servo/hyper" branch = "servo" [dependencies.layers] diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml index 609038382699..f6f2c1abdf53 100644 --- a/components/net/Cargo.toml +++ b/components/net/Cargo.toml @@ -14,7 +14,7 @@ path = "../util" git = "https://github.com/servo/rust-geom" [dependencies.hyper] -git = "https://github.com/hyperium/hyper" +git = "https://github.com/servo/hyper" branch = "servo" [dependencies.png] diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 667aa76d7f9d..e9d049ca265f 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -53,7 +53,7 @@ branch = "servo" git = "https://github.com/lifthrasiir/rust-encoding" [dependencies.hyper] -git = "https://github.com/hyperium/hyper" +git = "https://github.com/servo/hyper" branch = "servo" [dependencies.js] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index c6c165f2453a..0539c4b18aaf 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -92,7 +92,7 @@ name = "cookie" version = "0.0.1" source = "git+https://github.com/alexcrichton/cookie-rs#9b579dd9b8cf0624eee1d013e9b48577acd3c40e" dependencies = [ - "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)", + "openssl 0.2.2 (git+https://github.com/sfackler/rust-openssl.git)", "url 0.1.0 (git+https://github.com/servo/rust-url)", ] @@ -353,24 +353,15 @@ name = "html5ever_macros" version = "0.0.0" source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c" -[[package]] -name = "http" -version = "0.1.0-pre" -source = "git+https://github.com/servo/rust-http?ref=servo#f957b94deb2c939c8e3d73d51823b65f8a1f8256" -dependencies = [ - "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)", - "url 0.1.0 (git+https://github.com/servo/rust-url)", -] - [[package]] name = "hyper" version = "0.0.1" -source = "git+https://github.com/hyperium/hyper?ref=servo#414a302f6333abd4b2ae38ea328bc41f8ca8fdbe" +source = "git+https://github.com/servo/hyper?ref=servo#7edbbba41ecba6783a7bc130f2f1890793a20d51" dependencies = [ "cookie 0.0.1 (git+https://github.com/alexcrichton/cookie-rs)", "mime 0.0.1 (git+https://github.com/hyperium/mime.rs)", "move-acceptor 0.0.1 (git+https://github.com/reem/rust-move-acceptor)", - "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)", + "openssl 0.2.2 (git+https://github.com/sfackler/rust-openssl.git)", "typeable 0.0.1 (git+https://github.com/reem/rust-typeable)", "unsafe-any 0.1.0 (git+https://github.com/reem/rust-unsafe-any)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -453,7 +444,7 @@ source = "git+https://github.com/Kimundi/lazy-static.rs#62976cb611c5396e11315ae6 [[package]] name = "mime" version = "0.0.1" -source = "git+https://github.com/hyperium/mime.rs#467c271814d51659f12de88f87dcd3dc3280ee9b" +source = "git+https://github.com/hyperium/mime.rs#5264e04655974f85c8d6581395cc24597266c653" [[package]] name = "move-acceptor" @@ -472,7 +463,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)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -484,7 +475,7 @@ name = "net" version = "0.0.1" dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "hyper 0.0.1 (git+https://github.com/hyperium/hyper?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -493,8 +484,8 @@ dependencies = [ [[package]] name = "openssl" -version = "0.0.0" -source = "git+https://github.com/sfackler/rust-openssl.git#766ce4b7785c0b038bee95b74564e5b9bf7e9a4b" +version = "0.2.2" +source = "git+https://github.com/sfackler/rust-openssl.git#b91a267082d3066bb369d3aa5b572d48b9ed8ded" [[package]] name = "phf" @@ -545,7 +536,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?ref=servo)", - "hyper 0.0.1 (git+https://github.com/hyperium/hyper?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "msg 0.0.1", "net 0.0.1", diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock index 570b305f3b78..b6dd8055fcb7 100644 --- a/ports/android/glut_app/Cargo.lock +++ b/ports/android/glut_app/Cargo.lock @@ -67,6 +67,15 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "cookie" +version = "0.0.1" +source = "git+https://github.com/alexcrichton/cookie-rs#9b579dd9b8cf0624eee1d013e9b48577acd3c40e" +dependencies = [ + "openssl 0.2.2 (git+https://github.com/sfackler/rust-openssl.git)", + "url 0.1.0 (git+https://github.com/servo/rust-url)", +] + [[package]] name = "core_foundation" version = "0.1.0" @@ -278,11 +287,16 @@ version = "0.0.0" source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c" [[package]] -name = "http" -version = "0.1.0-pre" -source = "git+https://github.com/servo/rust-http?ref=servo#f957b94deb2c939c8e3d73d51823b65f8a1f8256" -dependencies = [ - "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)", +name = "hyper" +version = "0.0.1" +source = "git+https://github.com/servo/hyper?ref=servo#e48f52793ccb5b046714bb1f7a21b7e57f87fd5f" +dependencies = [ + "cookie 0.0.1 (git+https://github.com/alexcrichton/cookie-rs)", + "mime 0.0.1 (git+https://github.com/hyperium/mime.rs)", + "move-acceptor 0.0.1 (git+https://github.com/reem/rust-move-acceptor)", + "openssl 0.2.2 (git+https://github.com/sfackler/rust-openssl.git)", + "typeable 0.0.2 (git+https://github.com/reem/rust-typeable)", + "unsafe-any 0.1.1 (git+https://github.com/reem/rust-unsafe-any)", "url 0.1.0 (git+https://github.com/servo/rust-url)", ] @@ -360,6 +374,16 @@ name = "lazy_static" version = "0.1.0" source = "git+https://github.com/Kimundi/lazy-static.rs#62976cb611c5396e11315ae64c9c389576240eb7" +[[package]] +name = "mime" +version = "0.0.1" +source = "git+https://github.com/hyperium/mime.rs#5264e04655974f85c8d6581395cc24597266c653" + +[[package]] +name = "move-acceptor" +version = "0.0.1" +source = "git+https://github.com/reem/rust-move-acceptor#25c5c33a83f605fdd0f3d37d2589e2b0b4e6cbd1" + [[package]] name = "mozjs-sys" version = "0.0.0" @@ -372,7 +396,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)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -384,7 +408,7 @@ name = "net" version = "0.0.1" dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -398,8 +422,8 @@ source = "git+https://github.com/servo/rust-opengles#7f025f0069fbf6fefef4ed383b9 [[package]] name = "openssl" -version = "0.0.0" -source = "git+https://github.com/sfackler/rust-openssl.git#766ce4b7785c0b038bee95b74564e5b9bf7e9a4b" +version = "0.2.2" +source = "git+https://github.com/sfackler/rust-openssl.git#b91a267082d3066bb369d3aa5b572d48b9ed8ded" [[package]] name = "phf" @@ -450,7 +474,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?ref=servo)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "msg 0.0.1", "net 0.0.1", @@ -543,6 +567,16 @@ dependencies = [ name = "task_info" version = "0.0.1" +[[package]] +name = "typeable" +version = "0.0.2" +source = "git+https://github.com/reem/rust-typeable#2f240fb44ce2fcdbb2b890623bfb2afe18a67c05" + +[[package]] +name = "unsafe-any" +version = "0.1.1" +source = "git+https://github.com/reem/rust-unsafe-any#eb3fe87bea85f375b8fcefa0cdecfd131fae9624" + [[package]] name = "url" version = "0.1.0" diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 4bc2cd2655ad..212b9232544e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -78,6 +78,15 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "cookie" +version = "0.0.1" +source = "git+https://github.com/alexcrichton/cookie-rs#9b579dd9b8cf0624eee1d013e9b48577acd3c40e" +dependencies = [ + "openssl 0.2.2 (git+https://github.com/sfackler/rust-openssl.git)", + "url 0.1.0 (git+https://github.com/servo/rust-url)", +] + [[package]] name = "core_foundation" version = "0.1.0" @@ -309,11 +318,16 @@ version = "0.0.0" source = "git+https://github.com/servo/html5ever?ref=servo#87c7e8b710391338b2463652be835f498923653c" [[package]] -name = "http" -version = "0.1.0-pre" -source = "git+https://github.com/servo/rust-http?ref=servo#f957b94deb2c939c8e3d73d51823b65f8a1f8256" -dependencies = [ - "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git)", +name = "hyper" +version = "0.0.1" +source = "git+https://github.com/servo/hyper?ref=servo#7edbbba41ecba6783a7bc130f2f1890793a20d51" +dependencies = [ + "cookie 0.0.1 (git+https://github.com/alexcrichton/cookie-rs)", + "mime 0.0.1 (git+https://github.com/hyperium/mime.rs)", + "move-acceptor 0.0.1 (git+https://github.com/reem/rust-move-acceptor)", + "openssl 0.2.2 (git+https://github.com/sfackler/rust-openssl.git)", + "typeable 0.0.2 (git+https://github.com/reem/rust-typeable)", + "unsafe-any 0.1.1 (git+https://github.com/reem/rust-unsafe-any)", "url 0.1.0 (git+https://github.com/servo/rust-url)", ] @@ -391,6 +405,16 @@ name = "lazy_static" version = "0.1.0" source = "git+https://github.com/Kimundi/lazy-static.rs#62976cb611c5396e11315ae64c9c389576240eb7" +[[package]] +name = "mime" +version = "0.0.1" +source = "git+https://github.com/hyperium/mime.rs#5264e04655974f85c8d6581395cc24597266c653" + +[[package]] +name = "move-acceptor" +version = "0.0.1" +source = "git+https://github.com/reem/rust-move-acceptor#25c5c33a83f605fdd0f3d37d2589e2b0b4e6cbd1" + [[package]] name = "mozjs-sys" version = "0.0.0" @@ -403,7 +427,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)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)", "layers 0.1.0 (git+https://github.com/servo/rust-layers)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -415,7 +439,7 @@ name = "net" version = "0.0.1" dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "png 0.1.0 (git+https://github.com/servo/rust-png)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "url 0.1.0 (git+https://github.com/servo/rust-url)", @@ -424,8 +448,8 @@ dependencies = [ [[package]] name = "openssl" -version = "0.0.0" -source = "git+https://github.com/sfackler/rust-openssl.git#766ce4b7785c0b038bee95b74564e5b9bf7e9a4b" +version = "0.2.2" +source = "git+https://github.com/sfackler/rust-openssl.git#b91a267082d3066bb369d3aa5b572d48b9ed8ded" [[package]] name = "phf" @@ -476,7 +500,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?ref=servo)", - "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo)", + "hyper 0.0.1 (git+https://github.com/servo/hyper?ref=servo)", "js 0.1.0 (git+https://github.com/servo/rust-mozjs)", "msg 0.0.1", "net 0.0.1", @@ -575,6 +599,16 @@ dependencies = [ name = "task_info" version = "0.0.1" +[[package]] +name = "typeable" +version = "0.0.2" +source = "git+https://github.com/reem/rust-typeable#2f240fb44ce2fcdbb2b890623bfb2afe18a67c05" + +[[package]] +name = "unsafe-any" +version = "0.1.1" +source = "git+https://github.com/reem/rust-unsafe-any#eb3fe87bea85f375b8fcefa0cdecfd131fae9624" + [[package]] name = "url" version = "0.1.0" diff --git a/tests/wpt/metadata/XMLHttpRequest/send-content-type-charset.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-content-type-charset.htm.ini index 49ac57c781e0..1b03a0dcc456 100644 --- a/tests/wpt/metadata/XMLHttpRequest/send-content-type-charset.htm.ini +++ b/tests/wpt/metadata/XMLHttpRequest/send-content-type-charset.htm.ini @@ -3,12 +3,6 @@ [XMLHttpRequest: send() - charset parameter of Content-Type] expected: FAIL - [XMLHttpRequest: send() - charset parameter of Content-Type 1] - expected: FAIL - - [XMLHttpRequest: send() - charset parameter of Content-Type 2] - expected: FAIL - [XMLHttpRequest: send() - charset parameter of Content-Type 3] expected: FAIL diff --git a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-none.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-entity-body-none.htm.ini deleted file mode 100644 index ff2c72f3b8ca..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/send-entity-body-none.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[send-entity-body-none.htm] - type: testharness - [XMLHttpRequest: send(null) - no entity body] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/send-redirect-infinite-sync.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-redirect-infinite-sync.htm.ini deleted file mode 100644 index db80e8369c09..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/send-redirect-infinite-sync.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[send-redirect-infinite-sync.htm] - type: testharness - [XMLHttpRequest: send() - Redirects (infinite loop; sync) (301)] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/send-redirect-infinite.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-redirect-infinite.htm.ini deleted file mode 100644 index fa053ae4846c..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/send-redirect-infinite.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[send-redirect-infinite.htm] - type: testharness - [XMLHttpRequest: send() - Redirects (infinite loop)] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/send-redirect.htm.ini b/tests/wpt/metadata/XMLHttpRequest/send-redirect.htm.ini deleted file mode 100644 index 6a448006b105..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/send-redirect.htm.ini +++ /dev/null @@ -1,14 +0,0 @@ -[send-redirect.htm] - type: testharness - [XMLHttpRequest: send() - Redirects (basics) (301)] - expected: FAIL - - [XMLHttpRequest: send() - Redirects (basics) (302)] - expected: FAIL - - [XMLHttpRequest: send() - Redirects (basics) (303)] - expected: FAIL - - [XMLHttpRequest: send() - Redirects (basics) (307)] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/setrequestheader-case-insensitive.htm.ini b/tests/wpt/metadata/XMLHttpRequest/setrequestheader-case-insensitive.htm.ini deleted file mode 100644 index 16277476d3ab..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/setrequestheader-case-insensitive.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[setrequestheader-case-insensitive.htm] - type: testharness - [XMLHttpRequest: setRequestHeader() - headers that differ in case] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini b/tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini deleted file mode 100644 index 9230d5e7bc0a..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini +++ /dev/null @@ -1,26 +0,0 @@ -[setrequestheader-header-allowed.htm] - type: testharness - [XMLHttpRequest: setRequestHeader() - headers that are allowed (Authorization)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (Pragma)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (Content-Transfer-Encoding)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (Content-Type)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (Overwrite)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (If)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (Status-URI)] - expected: FAIL - - [XMLHttpRequest: setRequestHeader() - headers that are allowed (X-Pink-Unicorn)] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-network-error-sync.htm.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-network-error-sync.htm.ini deleted file mode 100644 index 8115118f405d..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-network-error-sync.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[xmlhttprequest-network-error-sync.htm] - type: testharness - [XMLHttpRequest: members during network errors (sync)] - expected: FAIL - diff --git a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-network-error.htm.ini b/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-network-error.htm.ini deleted file mode 100644 index b1eacace2f8b..000000000000 --- a/tests/wpt/metadata/XMLHttpRequest/xmlhttprequest-network-error.htm.ini +++ /dev/null @@ -1,5 +0,0 @@ -[xmlhttprequest-network-error.htm] - type: testharness - [XMLHttpRequest: members during network errors] - expected: FAIL - diff --git a/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini index c8062b040a11..55aa2aab8ac1 100644 --- a/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini +++ b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini @@ -1,6 +1,5 @@ [redirect.html] type: testharness - expected: TIMEOUT [location with a worker in separate file that redirects] - expected: TIMEOUT + expected: FAIL