grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dapps-https

Browse Source 
Conflicts:
	Cargo.lock
This commit is contained in:
Tomasz Drwięga
2016-09-01 13:37:23 +02:00
parent 99acd4914e b4f3c4bd7a
commit 36c83a456b
62 changed files with 1729 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dapps/src/apps/fetcher.rs
View File

@@ -26,7 +26,7 @@ use std::sync::Arc;
use std::sync::atomic::{AtomicBool};
use rustc_serialize::hex::FromHex;
use hyper::Control;
use hyper;
use hyper::status::StatusCode;
use random_filename;
@@ -85,7 +85,7 @@ impl<R: URLHint> AppFetcher<R> {
}
}
pub fn to_handler(&self, path: EndpointPath, control: Control) -> Box<Handler> {
pub fn to_async_handler(&self, path: EndpointPath, control: hyper::Control) -> Box<Handler> {
let mut dapps = self.dapps.lock();
let app_id = path.app_id.clone();
@@ -94,7 +94,7 @@ impl<R: URLHint> AppFetcher<R> {
match status {
// Just server dapp
Some(&mut ContentStatus::Ready(ref endpoint)) => {
(None, endpoint.to_handler(path))
(None, endpoint.to_async_handler(path, control))
},
// App is already being fetched
Some(&mut ContentStatus::Fetching(_)) => {