From 81d1d36764592e659fc4b5ff448f4b597ba2d049 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Sat, 11 Jul 2015 00:22:18 +0100 Subject: [PATCH] webdriver: Merge pull request #12 from SimonSapin/patch-1 Upgrade hyper Source-Repo: https://github.com/mozilla/webdriver-rust Source-Revision: caf906e67d818f2db5d4f31b08abb0fee561ec43 --- testing/webdriver/Cargo.toml | 2 +- testing/webdriver/src/server.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/webdriver/Cargo.toml b/testing/webdriver/Cargo.toml index 24a4d85fe3bfa..eace168246f16 100644 --- a/testing/webdriver/Cargo.toml +++ b/testing/webdriver/Cargo.toml @@ -12,4 +12,4 @@ log = "0.3.1" regex = "0.1.30" rustc-serialize = "0.3.14" uuid = "0.1.17" -hyper = "0.5" +hyper = "0.6" diff --git a/testing/webdriver/src/server.rs b/testing/webdriver/src/server.rs index e4c37f7d3c4ad..a8e6a8ae23f58 100644 --- a/testing/webdriver/src/server.rs +++ b/testing/webdriver/src/server.rs @@ -231,12 +231,12 @@ pub fn start(address: SocketAddr, handler: T) { let api = WebDriverHttpApi::new(); let http_handler = HttpHandler::new(api, msg_send); - let server = Server::http(http_handler); + let server = Server::http(address).unwrap(); let builder = thread::Builder::new().name("webdriver dispatcher".to_string()); builder.spawn(move || { let mut dispatcher = Dispatcher::new(handler); dispatcher.run(msg_recv) }).unwrap(); - server.listen(&address).unwrap(); + server.handle(http_handler).unwrap(); }