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

Handle h2 connection disconnect

Browse source
This commit is contained in:
Nikolay Kim 2022-07-12 15:23:27 +02:00
parent 0f28860fed
commit 064e3b5b8f
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.5.22] - 2022-07-12
* http: Handle h2 connection disconnect
## [0.5.21] - 2022-07-07 ## [0.5.21] - 2022-07-07
* http: fix h2 client, send scheme and authority * http: fix h2 client, send scheme and authority

4
ntex/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex" name = "ntex"
version = "0.5.21" version = "0.5.22"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "Framework for composable network services" description = "Framework for composable network services"
readme = "README.md" readme = "README.md"
@ -56,7 +56,7 @@ ntex-service = "0.3.2"
ntex-macros = "0.1.3" ntex-macros = "0.1.3"
ntex-util = "0.1.17" ntex-util = "0.1.17"
ntex-bytes = "0.1.16" ntex-bytes = "0.1.16"
ntex-h2 = "0.1.1" ntex-h2 = "0.1.3"
ntex-rt = "0.4.4" ntex-rt = "0.4.4"
ntex-io = "0.1.8" ntex-io = "0.1.8"
ntex-tls = "0.1.5" ntex-tls = "0.1.5"

11
ntex/src/http/client/h2proto.rs
View file

@ -298,7 +298,16 @@ impl Service<h2::Message> for H2PublishService {
Ready::Err("Cannot find Stream info") Ready::Err("Cannot find Stream info")
} }
} }
_ => Ready::Ok(()), h2::MessageKind::Disconnect(err) => {
log::debug!("Connection is disconnected {:?}", err);
if let Some(mut info) = self.0.streams.borrow_mut().remove(&msg.id()) {
if let Some(ref mut pl) = info.payload {
pl.set_error(io::Error::new(io::ErrorKind::Other, err).into());
}
}
Ready::Ok(())
}
h2::MessageKind::Empty => Ready::Ok(()),
} }
} }
} }

11
ntex/src/http/h2/service.rs
View file

@ -1,4 +1,4 @@
use std::{cell::RefCell, task::Context, task::Poll}; use std::{cell::RefCell, io, task::Context, task::Poll};
use std::{convert::TryFrom, future::Future, marker::PhantomData, mem, pin::Pin, rc::Rc}; use std::{convert::TryFrom, future::Future, marker::PhantomData, mem, pin::Pin, rc::Rc};
use ntex_h2::{self as h2, frame::StreamId, server}; use ntex_h2::{self as h2, frame::StreamId, server};
@ -349,7 +349,14 @@ where
} }
return Either::Right(Ready::Ok(())); return Either::Right(Ready::Ok(()));
} }
_ => return Either::Right(Ready::Ok(())), h2::MessageKind::Disconnect(err) => {
log::debug!("Connection is disconnected {:?}", err);
if let Some(mut sender) = self.streams.borrow_mut().remove(&msg.id()) {
sender.set_error(io::Error::new(io::ErrorKind::Other, err).into());
}
return Either::Right(Ready::Ok(()));
}
h2::MessageKind::Empty => return Either::Right(Ready::Ok(())),
}; };
let cfg = self.config.clone(); let cfg = self.config.clone();