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

Fixing compilation errors

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-04-16 00:57:13 +02:00
parent 13c25c5d49
commit 7516b737ee
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webapp/src/page/mod.rs
View File

@ -42,7 +42,7 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
Box::new(PageHandler {
app: self.app.clone(),
prefix: prefix.to_owned(),
prefix2: prefix.to_owned() + "/",
prefix_with_slash: prefix.to_owned() + "/",
path: None,
write_pos: 0,
})
@ -52,7 +52,7 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
struct PageHandler<T: WebApp + 'static> {
app: Arc<T>,
prefix: String,
prefix2: String,
prefix_with_slash: String,
path: Option<String>,
write_pos: usize,
}
@ -60,12 +60,11 @@ struct PageHandler<T: WebApp + 'static> {
impl<T: WebApp + 'static> server::Handler<HttpStream> for PageHandler<T> {
fn on_request(&mut self, req: server::Request) -> Next {
if let RequestUri::AbsolutePath(ref path) = *req.uri() {
// Support index file
if path == &self.prefix || path == &self.prefix2 {
self.path = Some("index.html".to_owned());
} else {
self.path = Some(path[self.prefix2.len()..].to_owned());
}
// Index file support
self.path = match path == &self.prefix || path == &self.prefix_with_slash {
true => Some("index.html".to_owned()),
false => Some(path[self.prefix_with_slash.len()..].to_owned()),
};
}
Next::write()
}

4
webapp/src/rpc.rs
View File

@ -25,13 +25,13 @@ use endpoint::Endpoint;
pub fn rpc(handler: Arc<IoHandler>) -> Box<Endpoint> {
Box::new(RpcEndpoint {
handler: handler,
cors_domain: AccessControlAllowOrigin::Null
cors_domain: Some(AccessControlAllowOrigin::Null)
})
}
struct RpcEndpoint {
handler: Arc<IoHandler>,
cors_domain: AccessControlAllowOrigin,
cors_domain: Option<AccessControlAllowOrigin>,
}
impl Endpoint for RpcEndpoint {