Merge branch 'master' into rpc_poll_ids

2016-02-26 15:57:23 +01:00
parent 0318907fb3 6e5ae636cc
commit 2947a1415b
23 changed files with 490 additions and 941 deletions
--- a/rpc/src/lib.rs.in
+++ b/rpc/src/lib.rs.in
@@ -23,8 +23,8 @@ impl HttpServer {
 	}

 	/// Start server asynchronously in new thread
-	pub fn start_async(self, addr: &str) {
+	pub fn start_async(self, addr: &str, cors_domain: &str) {
 		let server = jsonrpc_http_server::Server::new(self.handler, self.threads);
-		server.start_async(addr)
+		server.start_async(addr, jsonrpc_http_server::AccessControlAllowOrigin::Value(cors_domain.to_owned()))
 	}
 }