actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 14:49:20 +02:00
Code Issues Releases Wiki Activity

update test-server tests

Browse Source
This commit is contained in:
Nikolay Kim
2019-11-19 11:08:03 +06:00
parent 5ab29b2e62
commit 687884fb94
8 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actix-http/src/client/h1proto.rs
View File

@ -76,7 +76,8 @@ where
};
// read response and init read body
let (head, framed) = if let (Some(result), framed) = framed.into_future().await {
let res = framed.into_future().await;
let (head, framed) = if let (Some(result), framed) = res {
let item = result.map_err(SendRequestError::from)?;
(item, framed)
} else {

10
actix-http/src/h1/dispatcher.rs
View File

@ -331,12 +331,10 @@ where
Poll::Ready(Err(err)) => return Err(DispatchError::Io(err)),
}
}
if written > 0 {
if written == self.write_buf.len() {
unsafe { self.write_buf.set_len(0) }
} else {
let _ = self.write_buf.split_to(written);
}
if written == self.write_buf.len() {
unsafe { self.write_buf.set_len(0) }
} else {
let _ = self.write_buf.split_to(written);
}
Ok(false)
}

2
actix-http/src/h2/dispatcher.rs
View File

@ -122,7 +122,7 @@ where
match Pin::new(&mut this.connection).poll_accept(cx) {
Poll::Ready(None) => return Poll::Ready(Ok(())),
Poll::Ready(Some(Err(err))) => return Poll::Ready(Err(err.into())),
Poll::Ready(Some(Ok((req, res)))) => {
Poll::Ready(Some(Ok((req, _)))) => {
// update keep-alive expire
if this.ka_timer.is_some() {
if let Some(expire) = this.config.keep_alive_expire() {