From 4742860b2ecbcbc4f8cfd2148b72e8fb31bd6c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Wed, 1 Jun 2016 18:00:40 +0200
Subject: [PATCH] Using ethcore http server

---
 Cargo.lock       | 5 +++--
 dapps/Cargo.toml | 3 ++-
 rpc/Cargo.toml   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a686b849e..161b9d968 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -270,7 +270,7 @@ dependencies = [
  "ethcore-util 1.2.0",
  "hyper 0.9.3 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)",
- "jsonrpc-http-server 5.1.0",
+ "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-dapps-rs.git)",
  "parity-dapps-builtins 0.5.0 (git+https://github.com/ethcore/parity-dapps-builtins-rs.git)",
@@ -338,7 +338,7 @@ dependencies = [
  "ethsync 1.2.0",
  "json-ipc-server 0.1.0 (git+https://github.com/tomusdrw/json-ipc-server.git)",
  "jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)",
- "jsonrpc-http-server 5.1.0",
+ "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -604,6 +604,7 @@ dependencies = [
 [[package]]
 name = "jsonrpc-http-server"
 version = "5.1.0"
+source = "git+https://github.com/ethcore/jsonrpc-http-server.git#7a4f322a31834737c8f007b00e7d376f7dc07cdb"
 dependencies = [
  "hyper 0.9.3 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-core 2.0.4 (git+https://github.com/ethcore/jsonrpc-core.git)",
diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
index b7d752779..3af7aac97 100644
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -11,7 +11,8 @@ build = "build.rs"
 [dependencies]
 log = "0.3"
 jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
-jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" }
+# jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" }
+jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
 hyper = { default-features = false, git = "https://github.com/ethcore/hyper" }
 url = "1.0"
 rustc-serialize = "0.3"
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 815ed7b31..1dfa1eeed 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -13,8 +13,8 @@ log = "0.3"
 serde = "0.7.0"
 serde_json = "0.7.0"
 jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc-core.git" }
-# jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git", branch = "multiple_cors_domains" }
-jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" }
+jsonrpc-http-server = { git = "https://github.com/ethcore/jsonrpc-http-server.git" }
+# jsonrpc-http-server = { path = "../../../workspace/jsonrpc-http-server" }
 ethcore-util = { path = "../util" }
 ethcore = { path = "../ethcore" }
 ethash = { path = "../ethash" }