forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(server): GET requests with no body have None instead of Empty

Browse Source 
Closes #1373
This commit is contained in:
Sean McArthur
2017-11-14 11:52:29 -08:00
parent b1785c662b
commit 8bf7964875
4 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/proto/dispatch.rs
View File

@@ -18,7 +18,7 @@ pub trait Dispatch {
type PollBody; type PollBody;
type RecvItem; type RecvItem;
fn poll_msg(&mut self) -> Poll<Option<(Self::PollItem, Option<Self::PollBody>)>, ::Error>; fn poll_msg(&mut self) -> Poll<Option<(Self::PollItem, Option<Self::PollBody>)>, ::Error>;
fn recv_msg(&mut self, msg: ::Result<(Self::RecvItem, Body)>) -> ::Result<()>; fn recv_msg(&mut self, msg: ::Result<(Self::RecvItem, Option<Body>)>) -> ::Result<()>;
fn should_poll(&self) -> bool; fn should_poll(&self) -> bool;
} }
@@ -60,9 +60,9 @@ where
let body = if has_body { let body = if has_body {
let (tx, rx) = super::Body::pair(); let (tx, rx) = super::Body::pair();
self.body_tx = Some(tx); self.body_tx = Some(tx);
rx Some(rx)
} else { } else {
Body::empty() None
}; };
self.dispatch.recv_msg(Ok((head, body))).expect("recv_msg with Ok shouldn't error"); self.dispatch.recv_msg(Ok((head, body))).expect("recv_msg with Ok shouldn't error");
}, },
@@ -253,7 +253,7 @@ where
} }
} }
fn recv_msg(&mut self, msg: ::Result<(Self::RecvItem, Body)>) -> ::Result<()> { fn recv_msg(&mut self, msg: ::Result<(Self::RecvItem, Option<Body>)>) -> ::Result<()> {
let (msg, body) = msg?; let (msg, body) = msg?;
let req = super::request::from_wire(None, msg, body); let req = super::request::from_wire(None, msg, body);
self.in_flight = Some(self.service.call(req)); self.in_flight = Some(self.service.call(req));
@@ -300,10 +300,10 @@ where
} }
} }
fn recv_msg(&mut self, msg: ::Result<(Self::RecvItem, Body)>) -> ::Result<()> { fn recv_msg(&mut self, msg: ::Result<(Self::RecvItem, Option<Body>)>) -> ::Result<()> {
match msg { match msg {
Ok((msg, body)) => { Ok((msg, body)) => {
let res = super::response::from_wire(msg, Some(body)); let res = super::response::from_wire(msg, body);
let cb = self.callback.take().expect("recv_msg without callback"); let cb = self.callback.take().expect("recv_msg without callback");
let _ = cb.send(Ok(res)); let _ = cb.send(Ok(res));
Ok(()) Ok(())

6
src/proto/request.rs
View File

@@ -168,16 +168,16 @@ impl<B> From<http::Request<B>> for Request<B> {
} }
/// Constructs a request using a received ResponseHead and optional body /// Constructs a request using a received ResponseHead and optional body
pub fn from_wire<B>(addr: Option<SocketAddr>, incoming: RequestHead, body: B) -> Request<B> { pub fn from_wire(addr: Option<SocketAddr>, incoming: RequestHead, body: Option<Body>) -> Request<Body> {
let MessageHead { version, subject: RequestLine(method, uri), headers } = incoming; let MessageHead { version, subject: RequestLine(method, uri), headers } = incoming;
Request::<B> { Request {
method: method, method: method,
uri: uri, uri: uri,
headers: headers, headers: headers,
version: version, version: version,
remote_addr: addr, remote_addr: addr,
body: Some(body), body: body,
is_proxy: false, is_proxy: false,
} }
} }

8
src/server/server_proto.rs
View File

@@ -219,8 +219,8 @@ impl From<Message<__ProtoRequest, proto::TokioBody>> for Request {
#[inline] #[inline]
fn from(message: Message<__ProtoRequest, proto::TokioBody>) -> Request { fn from(message: Message<__ProtoRequest, proto::TokioBody>) -> Request {
let (head, body) = match message { let (head, body) = match message {
Message::WithoutBody(head) => (head.0, proto::Body::empty()), Message::WithoutBody(head) => (head.0, None),
Message::WithBody(head, body) => (head.0, body.into()), Message::WithBody(head, body) => (head.0, Some(body.into())),
}; };
request::from_wire(None, head, body) request::from_wire(None, head, body)
} }
@@ -256,8 +256,8 @@ impl<T, B> Service for HttpService<T>
#[inline] #[inline]
fn call(&self, message: Self::Request) -> Self::Future { fn call(&self, message: Self::Request) -> Self::Future {
let (head, body) = match message { let (head, body) = match message {
Message::WithoutBody(head) => (head.0, proto::Body::empty()), Message::WithoutBody(head) => (head.0, None),
Message::WithBody(head, body) => (head.0, body.into()), Message::WithBody(head, body) => (head.0, Some(body.into())),
}; };
let req = request::from_wire(Some(self.remote_addr), head, body); let req = request::from_wire(Some(self.remote_addr), head, body);
self.inner.call(req).map(Into::into) self.inner.call(req).map(Into::into)

42
tests/server.rs
View File

@@ -21,6 +21,7 @@ use std::time::Duration;
use hyper::server::{Http, Request, Response, Service, NewService}; use hyper::server::{Http, Request, Response, Service, NewService};
#[test] #[test]
fn get_should_ignore_body() { fn get_should_ignore_body() {
let server = serve(); let server = serve();
@@ -56,6 +57,47 @@ fn get_with_body() {
assert_eq!(server.body(), b"I'm a good request."); assert_eq!(server.body(), b"I'm a good request.");
} }
#[test]
fn get_implicitly_empty() {
// See https://github.com/hyperium/hyper/issues/1373
let mut core = Core::new().unwrap();
let listener = TcpListener::bind(&"127.0.0.1:0".parse().unwrap(), &core.handle()).unwrap();
let addr = listener.local_addr().unwrap();
thread::spawn(move || {
let mut tcp = connect(&addr);
tcp.write_all(b"\
GET / HTTP/1.1\r\n\
Host: example.domain\r\n\
\r\n\
").unwrap();
});
let fut = listener.incoming()
.into_future()
.map_err(|_| unreachable!())
.and_then(|(item, _incoming)| {
let (socket, _) = item.unwrap();
Http::<hyper::Chunk>::new().serve_connection(socket, GetImplicitlyEmpty)
});
core.run(fut).unwrap();
struct GetImplicitlyEmpty;
impl Service for GetImplicitlyEmpty {
type Request = Request;
type Response = Response;
type Error = hyper::Error;
type Future = FutureResult<Self::Response, Self::Error>;
fn call(&self, req: Request) -> Self::Future {
assert!(req.body_ref().is_none());
future::ok(Response::new())
}
}
}
#[test] #[test]
fn get_fixed_response() { fn get_fixed_response() {
let foo_bar = b"foo bar baz"; let foo_bar = b"foo bar baz";