aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/devtools/Cargo.toml2
-rw-r--r--components/devtools_traits/Cargo.toml2
-rw-r--r--components/msg/Cargo.toml2
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net/http_loader.rs4
-rw-r--r--components/net_traits/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/cors.rs5
-rw-r--r--components/servo/Cargo.lock39
-rw-r--r--ports/cef/Cargo.lock37
-rw-r--r--ports/gonk/Cargo.lock37
-rw-r--r--tests/unit/net/Cargo.toml2
12 files changed, 97 insertions, 39 deletions
diff --git a/components/devtools/Cargo.toml b/components/devtools/Cargo.toml
index 5fe447183ee..c42e37c9967 100644
--- a/components/devtools/Cargo.toml
+++ b/components/devtools/Cargo.toml
@@ -20,4 +20,4 @@ path = "../util"
time = "*"
rustc-serialize = "0.3"
url = "*"
-hyper = "*"
+hyper = "0.4"
diff --git a/components/devtools_traits/Cargo.toml b/components/devtools_traits/Cargo.toml
index 05cc4a9f283..8f4a4a8ba17 100644
--- a/components/devtools_traits/Cargo.toml
+++ b/components/devtools_traits/Cargo.toml
@@ -17,4 +17,4 @@ path = "../util"
time = "*"
rustc-serialize = "0.3"
url = "*"
-hyper = "*"
+hyper = "0.4"
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 035ce9aaa19..af1da0b3b7c 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -38,4 +38,4 @@ git = "https://github.com/servo/rust-png"
[dependencies]
url = "0.2.16"
bitflags = "*"
-hyper = "0.3"
+hyper = "0.4"
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 6869fb274e6..9dda02741aa 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -30,6 +30,6 @@ rustc-serialize = "0.3"
cookie="*"
regex = "0.1.14"
regex_macros = "0.1.8"
-hyper = "0.3"
+hyper = "0.4"
flate2 = "0.2.0"
uuid = "0.1.16"
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index bc3b72dddf0..b1b89de38f1 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -14,7 +14,7 @@ use file_loader;
use flate2::read::{DeflateDecoder, GzDecoder};
use hyper::client::Request;
use hyper::header::{AcceptEncoding, Accept, ContentLength, ContentType, Host, Location, qitem, Quality, QualityItem};
-use hyper::HttpError;
+use hyper::Error as HttpError;
use hyper::method::Method;
use hyper::mime::{Mime, TopLevel, SubLevel};
use hyper::net::HttpConnector;
@@ -135,7 +135,7 @@ reason: \"certificate verify failed\" }]))";
let mut req = match Request::with_connector(load_data.method.clone(), url.clone(), &mut connector) {
Ok(req) => req,
- Err(HttpError::HttpIoError(ref io_error)) if (
+ Err(HttpError::Io(ref io_error)) if (
io_error.kind() == io::ErrorKind::Other &&
io_error.description() == "Error in OpenSSL" &&
// FIXME: This incredibly hacky. Make it more robust, and at least test it.
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index 6f82ca385c6..54ceafc6c93 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -24,4 +24,4 @@ git = "https://github.com/servo/rust-stb-image"
[dependencies]
url = "0.2.16"
-hyper = "0.3"
+hyper = "0.4"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index ac3c05fbb6d..5db6d535d75 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -73,7 +73,7 @@ time = "0.1.12"
bitflags = "*"
rustc-serialize = "*"
libc = "*"
-hyper = "0.3"
+hyper = "0.4"
cssparser = "0.3.1"
unicase = "0.1"
num = "0.1.24"
diff --git a/components/script/cors.rs b/components/script/cors.rs
index cd7d0828564..0a0660c3d18 100644
--- a/components/script/cors.rs
+++ b/components/script/cors.rs
@@ -445,13 +445,14 @@ fn is_simple_method(m: &Method) -> bool {
/// Perform a CORS check on a header list and CORS request
/// https://fetch.spec.whatwg.org/#cors-check
pub fn allow_cross_origin_request(req: &CORSRequest, headers: &Headers) -> bool {
- //FIXME(seanmonstar): use req.headers.get::<AccessControlAllowOrigin>()
- match headers.get() {
+ match headers.get::<AccessControlAllowOrigin>() {
Some(&AccessControlAllowOrigin::Any) => true, // Not always true, depends on credentials mode
+ // FIXME: https://github.com/servo/servo/issues/6020
Some(&AccessControlAllowOrigin::Value(ref url)) =>
url.scheme == req.origin.scheme &&
url.host() == req.origin.host() &&
url.port() == req.origin.port(),
+ Some(&AccessControlAllowOrigin::Null) |
None => false
}
}
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 9af6b01feba..4a30f09896f 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -190,7 +190,7 @@ name = "devtools"
version = "0.0.1"
dependencies = [
"devtools_traits 0.0.1",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -202,7 +202,7 @@ dependencies = [
name = "devtools_traits"
version = "0.0.1"
dependencies = [
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -565,6 +565,25 @@ dependencies = [
]
[[package]]
+name = "hyper"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cookie 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "io_surface"
version = "0.1.0"
source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d"
@@ -747,7 +766,7 @@ dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"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.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -765,7 +784,7 @@ dependencies = [
"devtools_traits 0.0.1",
"flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"net_traits 0.0.1",
"openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -783,7 +802,7 @@ name = "net_tests"
version = "0.0.1"
dependencies = [
"cookie 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"net 0.0.1",
"net_traits 0.0.1",
"url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -795,7 +814,7 @@ name = "net_traits"
version = "0.0.1"
dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@@ -1006,7 +1025,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.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
@@ -1027,7 +1046,7 @@ dependencies = [
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"webdriver_traits 0.0.1",
- "websocket 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.11.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1286,12 +1305,12 @@ dependencies = [
[[package]]
name = "websocket"
-version = "0.11.8"
+version = "0.11.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 9c2a4d368d9..b60f3b5434d 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -199,7 +199,7 @@ name = "devtools"
version = "0.0.1"
dependencies = [
"devtools_traits 0.0.1",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -211,7 +211,7 @@ dependencies = [
name = "devtools_traits"
version = "0.0.1"
dependencies = [
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -567,6 +567,25 @@ dependencies = [
]
[[package]]
+name = "hyper"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cookie 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "io_surface"
version = "0.1.0"
source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d"
@@ -749,7 +768,7 @@ dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"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.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -767,7 +786,7 @@ dependencies = [
"devtools_traits 0.0.1",
"flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"net_traits 0.0.1",
"openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -785,7 +804,7 @@ name = "net_traits"
version = "0.0.1"
dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@@ -996,7 +1015,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.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
@@ -1017,7 +1036,7 @@ dependencies = [
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"webdriver_traits 0.0.1",
- "websocket 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.11.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1271,12 +1290,12 @@ dependencies = [
[[package]]
name = "websocket"
-version = "0.11.8"
+version = "0.11.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 6c4d3d750e0..1f94f0d944a 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -176,7 +176,7 @@ name = "devtools"
version = "0.0.1"
dependencies = [
"devtools_traits 0.0.1",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -188,7 +188,7 @@ dependencies = [
name = "devtools_traits"
version = "0.0.1"
dependencies = [
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -465,6 +465,25 @@ dependencies = [
]
[[package]]
+name = "hyper"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cookie 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "traitobject 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typeable 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "io_surface"
version = "0.1.0"
source = "git+https://github.com/servo/rust-io-surface#ab0ebd4ea6dd953c1581d9486b9e80ecf3c7577d"
@@ -639,7 +658,7 @@ dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"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.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -657,7 +676,7 @@ dependencies = [
"devtools_traits 0.0.1",
"flate2 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"net_traits 0.0.1",
"openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
@@ -675,7 +694,7 @@ name = "net_traits"
version = "0.0.1"
dependencies = [
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
@@ -867,7 +886,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.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
@@ -888,7 +907,7 @@ dependencies = [
"util 0.0.1",
"uuid 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"webdriver_traits 0.0.1",
- "websocket 0.11.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "websocket 0.11.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1133,12 +1152,12 @@ dependencies = [
[[package]]
name = "websocket"
-version = "0.11.8"
+version = "0.11.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hyper 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"openssl 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-serialize 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/tests/unit/net/Cargo.toml b/tests/unit/net/Cargo.toml
index 5c265bfec6b..3e12cb18f5d 100644
--- a/tests/unit/net/Cargo.toml
+++ b/tests/unit/net/Cargo.toml
@@ -19,5 +19,5 @@ path = "../../../components/util"
[dependencies]
cookie = "*"
-hyper = "*"
+hyper = "0.4"
url = "*"