fix(server): support HTTP/1.1 pipelining
This commit is contained in:
@@ -117,10 +117,16 @@ impl<K: Key, T: Transport, H: MessageHandler<T>> ConnInner<K, T, H> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn parse(&mut self) -> ::Result<http::MessageHead<<<H as MessageHandler<T>>::Message as Http1Message>::Incoming>> {
|
fn parse(&mut self) -> ::Result<http::MessageHead<<<H as MessageHandler<T>>::Message as Http1Message>::Incoming>> {
|
||||||
let n = try!(self.buf.read_from(&mut self.transport));
|
match self.buf.read_from(&mut self.transport) {
|
||||||
if n == 0 {
|
Ok(0) => {
|
||||||
trace!("parse eof");
|
trace!("parse eof");
|
||||||
return Err(io::Error::new(io::ErrorKind::UnexpectedEof, "parse eof").into());
|
return Err(io::Error::new(io::ErrorKind::UnexpectedEof, "parse eof").into());
|
||||||
|
}
|
||||||
|
Ok(_) => {},
|
||||||
|
Err(e) => match e.kind() {
|
||||||
|
io::ErrorKind::WouldBlock => {},
|
||||||
|
_ => return Err(e.into())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
match try!(http::parse::<<H as MessageHandler<T>>::Message, _>(self.buf.bytes())) {
|
match try!(http::parse::<<H as MessageHandler<T>>::Message, _>(self.buf.bytes())) {
|
||||||
Some((head, len)) => {
|
Some((head, len)) => {
|
||||||
@@ -444,9 +450,9 @@ impl<K: Key, T: Transport, H: MessageHandler<T>> ConnInner<K, T, H> {
|
|||||||
state
|
state
|
||||||
}
|
}
|
||||||
|
|
||||||
fn can_read_more(&self) -> bool {
|
fn can_read_more(&self, was_init: bool) -> bool {
|
||||||
match self.state {
|
match self.state {
|
||||||
State::Init { .. } => false,
|
State::Init { .. } => !was_init && !self.buf.is_empty(),
|
||||||
_ => !self.buf.is_empty()
|
_ => !self.buf.is_empty()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -549,6 +555,11 @@ impl<K: Key, T: Transport, H: MessageHandler<T>> Conn<K, T, H> {
|
|||||||
events
|
events
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let was_init = match self.0.state {
|
||||||
|
State::Init { .. } => true,
|
||||||
|
_ => false
|
||||||
|
};
|
||||||
|
|
||||||
if events.is_readable() {
|
if events.is_readable() {
|
||||||
self.0.on_readable(scope);
|
self.0.on_readable(scope);
|
||||||
}
|
}
|
||||||
@@ -570,7 +581,7 @@ impl<K: Key, T: Transport, H: MessageHandler<T>> Conn<K, T, H> {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
if events.is_readable() && self.0.can_read_more() {
|
if events.is_readable() && self.0.can_read_more(was_init) {
|
||||||
return self.ready(events, scope);
|
return self.ready(events, scope);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user