mirror of
https://github.com/actix/actix-web.git
synced 2024-12-24 09:00:34 +00:00
http/2 end-of-frame is not set if body is empty bytes #307
This commit is contained in:
parent
b5b9f9656e
commit
8a22558f25
2 changed files with 28 additions and 20 deletions
|
@ -4,6 +4,8 @@
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
* http/2 end-of-frame is not set if body is empty bytes #307
|
||||||
|
|
||||||
* InternalError can trigger memory unsafety #301
|
* InternalError can trigger memory unsafety #301
|
||||||
|
|
||||||
* Fix docs.rs build
|
* Fix docs.rs build
|
||||||
|
|
|
@ -89,9 +89,6 @@ impl<H: 'static> Writer for H2Writer<H> {
|
||||||
self.flags.insert(Flags::STARTED);
|
self.flags.insert(Flags::STARTED);
|
||||||
self.encoder =
|
self.encoder =
|
||||||
ContentEncoder::for_server(self.buffer.clone(), req, msg, encoding);
|
ContentEncoder::for_server(self.buffer.clone(), req, msg, encoding);
|
||||||
if let Body::Empty = *msg.body() {
|
|
||||||
self.flags.insert(Flags::EOF);
|
|
||||||
}
|
|
||||||
|
|
||||||
// http2 specific
|
// http2 specific
|
||||||
msg.headers_mut().remove(CONNECTION);
|
msg.headers_mut().remove(CONNECTION);
|
||||||
|
@ -108,6 +105,11 @@ impl<H: 'static> Writer for H2Writer<H> {
|
||||||
let body = msg.replace_body(Body::Empty);
|
let body = msg.replace_body(Body::Empty);
|
||||||
match body {
|
match body {
|
||||||
Body::Binary(ref bytes) => {
|
Body::Binary(ref bytes) => {
|
||||||
|
if bytes.is_empty() {
|
||||||
|
msg.headers_mut()
|
||||||
|
.insert(CONTENT_LENGTH, HeaderValue::from_static("0"));
|
||||||
|
self.flags.insert(Flags::EOF);
|
||||||
|
} else {
|
||||||
let mut val = BytesMut::new();
|
let mut val = BytesMut::new();
|
||||||
helpers::convert_usize(bytes.len(), &mut val);
|
helpers::convert_usize(bytes.len(), &mut val);
|
||||||
let l = val.len();
|
let l = val.len();
|
||||||
|
@ -116,7 +118,9 @@ impl<H: 'static> Writer for H2Writer<H> {
|
||||||
HeaderValue::try_from(val.split_to(l - 2).freeze()).unwrap(),
|
HeaderValue::try_from(val.split_to(l - 2).freeze()).unwrap(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
Body::Empty => {
|
Body::Empty => {
|
||||||
|
self.flags.insert(Flags::EOF);
|
||||||
msg.headers_mut()
|
msg.headers_mut()
|
||||||
.insert(CONTENT_LENGTH, HeaderValue::from_static("0"));
|
.insert(CONTENT_LENGTH, HeaderValue::from_static("0"));
|
||||||
}
|
}
|
||||||
|
@ -141,6 +145,9 @@ impl<H: 'static> Writer for H2Writer<H> {
|
||||||
trace!("Response: {:?}", msg);
|
trace!("Response: {:?}", msg);
|
||||||
|
|
||||||
if let Body::Binary(bytes) = body {
|
if let Body::Binary(bytes) = body {
|
||||||
|
if bytes.is_empty() {
|
||||||
|
Ok(WriterState::Done)
|
||||||
|
} else {
|
||||||
self.flags.insert(Flags::EOF);
|
self.flags.insert(Flags::EOF);
|
||||||
self.written = bytes.len() as u64;
|
self.written = bytes.len() as u64;
|
||||||
self.encoder.write(bytes)?;
|
self.encoder.write(bytes)?;
|
||||||
|
@ -149,6 +156,7 @@ impl<H: 'static> Writer for H2Writer<H> {
|
||||||
stream.reserve_capacity(cmp::min(self.buffer.len(), CHUNK_SIZE));
|
stream.reserve_capacity(cmp::min(self.buffer.len(), CHUNK_SIZE));
|
||||||
}
|
}
|
||||||
Ok(WriterState::Pause)
|
Ok(WriterState::Pause)
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
msg.replace_body(body);
|
msg.replace_body(body);
|
||||||
self.buffer_capacity = msg.write_buffer_capacity();
|
self.buffer_capacity = msg.write_buffer_capacity();
|
||||||
|
@ -177,10 +185,8 @@ impl<H: 'static> Writer for H2Writer<H> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write_eof(&mut self) -> io::Result<WriterState> {
|
fn write_eof(&mut self) -> io::Result<WriterState> {
|
||||||
self.encoder.write_eof()?;
|
|
||||||
|
|
||||||
self.flags.insert(Flags::EOF);
|
self.flags.insert(Flags::EOF);
|
||||||
if !self.encoder.is_eof() {
|
if !self.encoder.write_eof()? {
|
||||||
Err(io::Error::new(
|
Err(io::Error::new(
|
||||||
io::ErrorKind::Other,
|
io::ErrorKind::Other,
|
||||||
"Last payload item, but eof is not reached",
|
"Last payload item, but eof is not reached",
|
||||||
|
|
Loading…
Reference in a new issue