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

Do not process data in Dispatcher from read buffer after disconnect

Browse source
This commit is contained in:
Nikolay Kim 2023-11-21 00:56:09 +06:00
parent 9db4f21d71
commit 096aae2732
2 changed files with 53 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-io/CHANGES.md
View file

@ -4,6 +4,8 @@
* Remove slow frame timer if service is not ready * Remove slow frame timer if service is not ready
* Do not process data in Dispatcher from read buffer after disconnect
## [0.3.8] - 2023-11-17 ## [0.3.8] - 2023-11-17
* Remove useless logs * Remove useless logs

93
ntex-io/src/dispatcher.rs
View file

@ -324,49 +324,58 @@ where
let item = match ready!(slf.poll_service(cx)) { let item = match ready!(slf.poll_service(cx)) {
PollService::Ready => { PollService::Ready => {
// decode incoming bytes if buffer is ready // decode incoming bytes if buffer is ready
match slf.shared.io.poll_recv_decode(&slf.shared.codec, cx) { if slf.shared.io.is_closed() {
Ok(decoded) => { log::trace!("io has been closed, stop dispatcher");
slf.update_timer(&decoded); slf.st = DispatcherState::Stop;
if let Some(el) = decoded.item { DispatchItem::Disconnect(None)
DispatchItem::Item(el) } else {
} else { match slf.shared.io.poll_recv_decode(&slf.shared.codec, cx)
return Poll::Pending; {
Ok(decoded) => {
slf.update_timer(&decoded);
if let Some(el) = decoded.item {
DispatchItem::Item(el)
} else {
return Poll::Pending;
}
} }
} Err(RecvError::KeepAlive) => {
Err(RecvError::KeepAlive) => { log::trace!(
log::trace!("keep-alive error, stopping dispatcher"); "keep-alive error, stopping dispatcher"
slf.st = DispatcherState::Stop; );
if slf.flags.contains(Flags::READ_TIMEOUT) { slf.st = DispatcherState::Stop;
DispatchItem::ReadTimeout if slf.flags.contains(Flags::READ_TIMEOUT) {
} else { DispatchItem::ReadTimeout
DispatchItem::KeepAliveTimeout } else {
DispatchItem::KeepAliveTimeout
}
}
Err(RecvError::Stop) => {
log::trace!("dispatcher is instructed to stop");
slf.st = DispatcherState::Stop;
continue;
}
Err(RecvError::WriteBackpressure) => {
// instruct write task to notify dispatcher when data is flushed
slf.st = DispatcherState::Backpressure;
DispatchItem::WBackPressureEnabled
}
Err(RecvError::Decoder(err)) => {
log::trace!(
"decoder error, stopping dispatcher: {:?}",
err
);
slf.st = DispatcherState::Stop;
DispatchItem::DecoderError(err)
}
Err(RecvError::PeerGone(err)) => {
log::trace!(
"peer is gone, stopping dispatcher: {:?}",
err
);
slf.st = DispatcherState::Stop;
DispatchItem::Disconnect(err)
} }
}
Err(RecvError::Stop) => {
log::trace!("dispatcher is instructed to stop");
slf.st = DispatcherState::Stop;
continue;
}
Err(RecvError::WriteBackpressure) => {
// instruct write task to notify dispatcher when data is flushed
slf.st = DispatcherState::Backpressure;
DispatchItem::WBackPressureEnabled
}
Err(RecvError::Decoder(err)) => {
log::trace!(
"decoder error, stopping dispatcher: {:?}",
err
);
slf.st = DispatcherState::Stop;
DispatchItem::DecoderError(err)
}
Err(RecvError::PeerGone(err)) => {
log::trace!(
"peer is gone, stopping dispatcher: {:?}",
err
);
slf.st = DispatcherState::Stop;
DispatchItem::Disconnect(err)
} }
} }
} }
@ -492,8 +501,8 @@ where
// remove all timers // remove all timers
if self.flags.contains(Flags::READ_TIMEOUT) { if self.flags.contains(Flags::READ_TIMEOUT) {
self.flags.remove(Flags::READ_TIMEOUT); self.flags.remove(Flags::READ_TIMEOUT);
self.shared.io.stop_timer();
} }
self.shared.io.stop_timer();
match ready!(self.shared.io.poll_read_pause(cx)) { match ready!(self.shared.io.poll_read_pause(cx)) {
IoStatusUpdate::KeepAlive => { IoStatusUpdate::KeepAlive => {