From 9bd41761fcd8750d64029b757661ce7a5734b590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Thu, 7 Apr 2016 16:30:49 +0200
Subject: [PATCH] Reverting back to old-hyper version of rpc

---
 Cargo.lock               | 12 +++++++++++-
 parity/main.rs           |  1 +
 webapp/Cargo.toml        |  2 +-
 webapp/src/router/mod.rs |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f6ce8941d..d702bd4fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -319,7 +319,7 @@ dependencies = [
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "iron 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-http-server 5.0.0 (git+https://github.com/debris/jsonrpc-http-server.git)",
+ "jsonrpc-http-server 4.0.0 (git+https://github.com/tomusdrw/jsonrpc-http-server.git?branch=old-hyper)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-status 0.1.1 (git+https://github.com/tomusdrw/parity-status.git)",
  "parity-wallet 0.1.0 (git+https://github.com/tomusdrw/parity-wallet.git)",
@@ -524,6 +524,16 @@ dependencies = [
  "syntex 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "jsonrpc-http-server"
+version = "4.0.0"
+source = "git+https://github.com/tomusdrw/jsonrpc-http-server.git?branch=old-hyper#46bd4e7cf8352e0efc940cf76d3dff99f1a3da15"
+dependencies = [
+ "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "jsonrpc-core 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "jsonrpc-http-server"
 version = "5.0.0"
diff --git a/parity/main.rs b/parity/main.rs
index 7ea8282f3..b9f95eee3 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -67,6 +67,7 @@ use daemonize::Daemonize;
 use number_prefix::{binary_prefix, Standalone, Prefixed};
 #[cfg(feature = "rpc")]
 use rpc::Server as RpcServer;
+#[cfg(feature = "webapp")]
 use webapp::Listening as WebappServer;
 
 mod price_info;
diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml
index 28df2b8f8..b63c04bf5 100644
--- a/webapp/Cargo.toml
+++ b/webapp/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Ethcore <admin@ethcore.io"]
 [dependencies]
 log = "0.3"
 jsonrpc-core = "2.0"
-jsonrpc-http-server = { git = "https://github.com/debris/jsonrpc-http-server.git" }
+jsonrpc-http-server = { git = "https://github.com/tomusdrw/jsonrpc-http-server.git", branch="old-hyper" }
 hyper = { version = "0.8", default-features = false }
 iron = { version = "0.3" }
 ethcore-rpc = { path = "../rpc" }
diff --git a/webapp/src/router/mod.rs b/webapp/src/router/mod.rs
index 700149307..fad8593b9 100644
--- a/webapp/src/router/mod.rs
+++ b/webapp/src/router/mod.rs
@@ -36,7 +36,7 @@ impl hyper::server::Handler for Router {
 				self.pages.get(url).unwrap().handle(req, res);
 			}
 			_ if req.method == hyper::method::Method::Post => {
-				// self.rpc.handle(req, res)
+				self.rpc.handle(req, res)
 			},
 			_ => self.main_page.handle(req, res),
 		}