Skip to content

Fix concurrent server example for new Response representation. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2014
Merged

Fix concurrent server example for new Response representation. #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions examples/concurrent-server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ use std::io::net::ip::Ipv4Addr;
use std::sync::Arc;

use hyper::{Get, Post};
use hyper::server::{Server, Handler, Incoming, Request, Response};
use hyper::server::{Server, Handler, Incoming, Request, Response, Fresh};
use hyper::header::common::ContentLength;

trait ConcurrentHandler: Send + Sync {
fn handle(&self, req: Request, res: Response);
fn handle(&self, req: Request, res: Response<Fresh>);
}

struct Concurrent<H: ConcurrentHandler> { handler: Arc<H> }
Expand All @@ -38,29 +38,31 @@ macro_rules! try_abort(
struct Echo;

impl ConcurrentHandler for Echo {
fn handle(&self, mut req: Request, mut res: Response) {
fn handle(&self, mut req: Request, mut res: Response<Fresh>) {
match req.uri {
hyper::uri::AbsolutePath(ref path) => match (&req.method, path.as_slice()) {
(&Get, "/") | (&Get, "/echo") => {
let out = b"Try POST /echo";

res.headers.set(ContentLength(out.len()));
res.headers_mut().set(ContentLength(out.len()));
let mut res = try_abort!(res.start());
try_abort!(res.write(out));
try_abort!(res.end());
return;
},
(&Post, "/echo") => (), // fall through, fighting mutable borrows
_ => {
res.status = hyper::status::NotFound;
try_abort!(res.end());
*res.status_mut() = hyper::status::NotFound;
try_abort!(res.start().and_then(|res| res.end()));
return;
}
},
_ => {
try_abort!(res.end());
try_abort!(res.start().and_then(|res| res.end()));
return;
}
}
let mut res = try_abort!(res.start());
try_abort!(copy(&mut req, &mut res));
try_abort!(res.end());
}
Expand Down