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

wip

Browse source
This commit is contained in:
Nikolay Kim 2024-12-05 13:39:07 +05:00
parent 154d27b743
commit 6cc37b2d31
10 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-io/src/io.rs
View file

@ -337,7 +337,7 @@ impl<F> Io<F> {
"Timeout", "Timeout",
))), ))),
Err(RecvError::Stop) => Err(Either::Right(io::Error::new( Err(RecvError::Stop) => Err(Either::Right(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::UnexpectedEof,
"Dispatcher stopped", "Dispatcher stopped",
))), ))),
Err(RecvError::WriteBackpressure) => { Err(RecvError::WriteBackpressure) => {

2
ntex-server/src/net/builder.rs
View file

@ -360,7 +360,7 @@ pub fn bind_addr<S: net::ToSocketAddrs>(
Err(e) Err(e)
} else { } else {
Err(io::Error::new( Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::InvalidInput,
"Cannot bind to address.", "Cannot bind to address.",
)) ))
} }

9
ntex-tls/src/openssl/connect.rs
View file

@ -51,11 +51,11 @@ impl<T: Address> SslConnector<T> {
log::trace!("{}: SSL Handshake start for: {:?}", io.tag(), host); log::trace!("{}: SSL Handshake start for: {:?}", io.tag(), host);
match openssl.configure() { match openssl.configure() {
Err(e) => Err(io::Error::new(io::ErrorKind::Other, e).into()), Err(e) => Err(io::Error::new(io::ErrorKind::InvalidInput, e).into()),
Ok(config) => { Ok(config) => {
let ssl = config let ssl = config
.into_ssl(&host) .into_ssl(&host)
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
let tag = io.tag(); let tag = io.tag();
match connect_io(io, ssl).await { match connect_io(io, ssl).await {
Ok(io) => { Ok(io) => {
@ -64,7 +64,10 @@ impl<T: Address> SslConnector<T> {
} }
Err(e) => { Err(e) => {
log::trace!("{}: SSL Handshake error: {:?}", tag, e); log::trace!("{}: SSL Handshake error: {:?}", tag, e);
Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)).into()) Err(
io::Error::new(io::ErrorKind::InvalidInput, format!("{}", e))
.into(),
)
} }
} }
} }

4
ntex-tls/src/openssl/mod.rs
View file

@ -250,7 +250,9 @@ async fn handle_result<T, F>(
ssl::ErrorCode::WANT_READ => { ssl::ErrorCode::WANT_READ => {
let res = io.read_notify().await; let res = io.read_notify().await;
match res? { match res? {
None => Err(io::Error::new(io::ErrorKind::Other, "disconnected")), None => {
Err(io::Error::new(io::ErrorKind::NotConnected, "disconnected"))
}
_ => Ok(None), _ => Ok(None),
} }
} }

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

@ -187,14 +187,17 @@ async fn get_response(
err err
); );
pl.set_error( pl.set_error(
io::Error::new(io::ErrorKind::Other, err) io::Error::new(
.into(), io::ErrorKind::UnexpectedEof,
err,
)
.into(),
); );
} }
_ => { _ => {
pl.set_error( pl.set_error(
io::Error::new( io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Unsupported,
"unexpected h2 message", "unexpected h2 message",
) )
.into(), .into(),
@ -216,7 +219,7 @@ async fn get_response(
} }
} }
_ => Err(SendRequestError::Error(Box::new(io::Error::new( _ => Err(SendRequestError::Error(Box::new(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Unsupported,
"unexpected h2 message", "unexpected h2 message",
)))), )))),
} }

2
ntex/src/http/encoding/encoder.rs
View file

@ -117,7 +117,7 @@ impl<B: MessageBody> MessageBody for Encoder<B> {
Poll::Ready(Ok(Err(e))) => return Poll::Ready(Some(Err(Box::new(e)))), Poll::Ready(Ok(Err(e))) => return Poll::Ready(Some(Err(Box::new(e)))),
Poll::Ready(Err(_)) => { Poll::Ready(Err(_)) => {
return Poll::Ready(Some(Err(Box::new(io::Error::new( return Poll::Ready(Some(Err(Box::new(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Interrupted,
"Canceled", "Canceled",
))))); )))));
} }

4
ntex/src/http/error.rs
View file

@ -217,7 +217,7 @@ pub enum BlockingError<E: fmt::Debug> {
impl From<crate::rt::JoinError> for PayloadError { impl From<crate::rt::JoinError> for PayloadError {
fn from(_: crate::rt::JoinError) -> Self { fn from(_: crate::rt::JoinError) -> Self {
PayloadError::Io(io::Error::new( PayloadError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Interrupted,
"Operation is canceled", "Operation is canceled",
)) ))
} }
@ -228,7 +228,7 @@ impl From<BlockingError<io::Error>> for PayloadError {
match err { match err {
BlockingError::Error(e) => PayloadError::Io(e), BlockingError::Error(e) => PayloadError::Io(e),
BlockingError::Canceled => PayloadError::Io(io::Error::new( BlockingError::Canceled => PayloadError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Interrupted,
"Operation is canceled", "Operation is canceled",
)), )),
} }

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

@ -408,7 +408,9 @@ where
h2::MessageKind::Disconnect(err) => { h2::MessageKind::Disconnect(err) => {
log::debug!("Connection is disconnected {:?}", err); log::debug!("Connection is disconnected {:?}", err);
if let Some(mut sender) = self.streams.borrow_mut().remove(&stream.id()) { if let Some(mut sender) = self.streams.borrow_mut().remove(&stream.id()) {
sender.set_error(io::Error::new(io::ErrorKind::Other, err).into()); sender.set_error(
io::Error::new(io::ErrorKind::UnexpectedEof, err).into(),
);
} }
return Ok(()); return Ok(());
} }

2
ntex/src/web/server.rs
View file

@ -467,7 +467,7 @@ where
Err(e) Err(e)
} else { } else {
Err(io::Error::new( Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::InvalidInput,
"Cannot bind to address.", "Cannot bind to address.",
)) ))
} }

8
ntex/src/ws/transport.rs
View file

@ -54,7 +54,7 @@ impl WsTransport {
Ok(()) Ok(())
} else { } else {
self.insert_flags(Flags::PROTO_ERR); self.insert_flags(Flags::PROTO_ERR);
Err(io::Error::new(io::ErrorKind::Other, err_message)) Err(io::Error::new(io::ErrorKind::InvalidData, err_message))
} }
} }
} }
@ -96,7 +96,7 @@ impl FilterLayer for WsTransport {
self.codec.decode_vec(&mut src).map_err(|e| { self.codec.decode_vec(&mut src).map_err(|e| {
log::trace!("Failed to decode ws codec frames: {:?}", e); log::trace!("Failed to decode ws codec frames: {:?}", e);
self.insert_flags(Flags::PROTO_ERR); self.insert_flags(Flags::PROTO_ERR);
io::Error::new(io::ErrorKind::Other, e) io::Error::new(io::ErrorKind::InvalidData, e)
})? { })? {
frame frame
} else { } else {
@ -123,14 +123,14 @@ impl FilterLayer for WsTransport {
Frame::Continuation(Item::FirstText(_)) => { Frame::Continuation(Item::FirstText(_)) => {
self.insert_flags(Flags::PROTO_ERR); self.insert_flags(Flags::PROTO_ERR);
return Err(io::Error::new( return Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::InvalidData,
"WebSocket Text continuation frames are not supported", "WebSocket Text continuation frames are not supported",
)); ));
} }
Frame::Text(_) => { Frame::Text(_) => {
self.insert_flags(Flags::PROTO_ERR); self.insert_flags(Flags::PROTO_ERR);
return Err(io::Error::new( return Err(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::InvalidData,
"WebSockets Text frames are not supported", "WebSockets Text frames are not supported",
)); ));
} }