mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 13:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix h1 dispatcher idle definition

Browse source
This commit is contained in:
Nikolay Kim 2020-07-29 11:15:47 +06:00
parent 9ccbf5d74f
commit e05bb784d6
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ntex/src/http/h1/dispatcher.rs
View file

@ -334,7 +334,7 @@ where
CallStateProject::Io => CallProcess::Io, CallStateProject::Io => CallProcess::Io,
}; };
let processing = match st { let idle = match st {
CallProcess::Next(st) => { CallProcess::Next(st) => {
// we have next call state, just proceed with it // we have next call state, just proceed with it
this = self.as_mut().project(); this = self.as_mut().project();
@ -345,7 +345,7 @@ where
// service response is in process, // service response is in process,
// we just flush output and that is it // we just flush output and that is it
this.inner.poll_write(cx)?; this.inner.poll_write(cx)?;
true false
} }
CallProcess::Io => { CallProcess::Io => {
// service call queue is empty, we can process next request // service call queue is empty, we can process next request
@ -367,13 +367,13 @@ where
this.upgrade.set(Some(fut)); this.upgrade.set(Some(fut));
return self.poll(cx); return self.poll(cx);
} }
CallProcess::Io => false, CallProcess::Io => true,
CallProcess::Pending => unreachable!(), CallProcess::Pending => unreachable!(),
} }
} }
PollWrite::Pending => false, PollWrite::Pending => this.inner.res_payload.is_none(),
PollWrite::PendingResponse => { PollWrite::PendingResponse => {
!this.inner.flags.contains(Flags::DISCONNECT) this.inner.flags.contains(Flags::DISCONNECT)
} }
} }
} }
@ -388,13 +388,13 @@ where
.inner .inner
.flags .flags
.intersects(Flags::DISCONNECT | Flags::STOP_READING) .intersects(Flags::DISCONNECT | Flags::STOP_READING)
&& !processing && idle
{ {
trace!("Shutdown connection (no more work) {:?}", this.inner.flags); trace!("Shutdown connection (no more work) {:?}", this.inner.flags);
this.inner.flags.insert(Flags::SHUTDOWN); this.inner.flags.insert(Flags::SHUTDOWN);
} }
// we dont have any parsed requests and output buffer is flushed // we dont have any parsed requests and output buffer is flushed
else if !processing && this.inner.write_buf.is_empty() { else if idle && this.inner.write_buf.is_empty() {
if let Some(err) = this.inner.error.take() { if let Some(err) = this.inner.error.take() {
trace!("Dispatcher error {:?}", err); trace!("Dispatcher error {:?}", err);
return Poll::Ready(Err(err)); return Poll::Ready(Err(err));
@ -421,7 +421,7 @@ where
// keep-alive book-keeping // keep-alive book-keeping
if this.inner.ka_timer.is_some() if this.inner.ka_timer.is_some()
&& this.inner.poll_keepalive(cx, processing)? && this.inner.poll_keepalive(cx, idle)?
{ {
this.inner.poll_shutdown(cx) this.inner.poll_shutdown(cx)
} else { } else {
@ -826,7 +826,7 @@ where
fn poll_keepalive( fn poll_keepalive(
&mut self, &mut self,
cx: &mut Context<'_>, cx: &mut Context<'_>,
processing: bool, idle: bool,
) -> Result<bool, DispatchError> { ) -> Result<bool, DispatchError> {
let ka_timer = self.ka_timer.as_mut().unwrap(); let ka_timer = self.ka_timer.as_mut().unwrap();
// do nothing for disconnected or upgrade socket or if keep-alive timer is disabled // do nothing for disconnected or upgrade socket or if keep-alive timer is disabled
@ -847,7 +847,7 @@ where
} }
} }
// normal keep-alive, but only if we are not processing any requests // normal keep-alive, but only if we are not processing any requests
else if !processing { else if idle {
// keep-alive timer // keep-alive timer
if Pin::new(&mut *ka_timer).poll(cx).is_ready() { if Pin::new(&mut *ka_timer).poll(cx).is_ready() {
if ka_timer.deadline() >= self.ka_expire { if ka_timer.deadline() >= self.ka_expire {