From dbc6402f483e1ff90b6eb8957c2654580d2f56b0 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <programble@gmail.com>
Date: Sun, 29 Nov 2015 17:30:40 -0500
Subject: [PATCH 1/2] Depend on hyper 0.7.0

---
 src/mako/Cargo.toml.mako | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mako/Cargo.toml.mako b/src/mako/Cargo.toml.mako
index 64fcdda786..0b00fd0e2c 100644
--- a/src/mako/Cargo.toml.mako
+++ b/src/mako/Cargo.toml.mako
@@ -26,7 +26,7 @@ name = "${util.program_name()}"
 % endif
 
 [dependencies]
-hyper = ">= 0.6.8"
+hyper = "0.7.0"
 ## Must match the one hyper uses, otherwise there are duplicate similarly named `Mime` structs
 mime = "0.1.0"
 serde = ">= 0.6.0"

From 61e74d99a225d48861c716bc2cb4fe6aa4b4cd54 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <programble@gmail.com>
Date: Sun, 29 Nov 2015 17:55:35 -0500
Subject: [PATCH 2/2] Fix impl of hyper::net::NetworkStream

---
 src/rust/api/cmn.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rust/api/cmn.rs b/src/rust/api/cmn.rs
index 6c5f90fe2a..74d761c4a0 100644
--- a/src/rust/api/cmn.rs
+++ b/src/rust/api/cmn.rs
@@ -112,6 +112,14 @@ impl hyper::net::NetworkStream for DummyNetworkStream {
     fn peer_addr(&mut self) -> io::Result<std::net::SocketAddr> {
         Ok("127.0.0.1:1337".parse().unwrap())
     }
+
+    fn set_read_timeout(&self, _dur: Option<std::time::Duration>) -> io::Result<()> {
+        Ok(())
+    }
+
+    fn set_write_timeout(&self, _dur: Option<std::time::Duration>) -> io::Result<()> {
+        Ok(())
+    }
 }