diff --git a/ntex-io/src/io.rs b/ntex-io/src/io.rs index 24f6e42e..e0b48976 100644 --- a/ntex-io/src/io.rs +++ b/ntex-io/src/io.rs @@ -337,7 +337,7 @@ impl Io { "Timeout", ))), Err(RecvError::Stop) => Err(Either::Right(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::UnexpectedEof, "Dispatcher stopped", ))), Err(RecvError::WriteBackpressure) => { diff --git a/ntex-server/src/net/builder.rs b/ntex-server/src/net/builder.rs index 95be84b9..0569f36a 100644 --- a/ntex-server/src/net/builder.rs +++ b/ntex-server/src/net/builder.rs @@ -360,7 +360,7 @@ pub fn bind_addr( Err(e) } else { Err(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::InvalidInput, "Cannot bind to address.", )) } diff --git a/ntex-tls/src/openssl/connect.rs b/ntex-tls/src/openssl/connect.rs index 3df5debf..c2ffe528 100644 --- a/ntex-tls/src/openssl/connect.rs +++ b/ntex-tls/src/openssl/connect.rs @@ -51,11 +51,11 @@ impl SslConnector { log::trace!("{}: SSL Handshake start for: {:?}", io.tag(), host); 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) => { let ssl = config .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(); match connect_io(io, ssl).await { Ok(io) => { @@ -64,7 +64,10 @@ impl SslConnector { } Err(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(), + ) } } } diff --git a/ntex-tls/src/openssl/mod.rs b/ntex-tls/src/openssl/mod.rs index 45ed1fcd..429b1e41 100644 --- a/ntex-tls/src/openssl/mod.rs +++ b/ntex-tls/src/openssl/mod.rs @@ -250,7 +250,9 @@ async fn handle_result( ssl::ErrorCode::WANT_READ => { let res = io.read_notify().await; match res? { - None => Err(io::Error::new(io::ErrorKind::Other, "disconnected")), + None => { + Err(io::Error::new(io::ErrorKind::NotConnected, "disconnected")) + } _ => Ok(None), } } diff --git a/ntex/src/http/client/h2proto.rs b/ntex/src/http/client/h2proto.rs index e04d4763..e98209f7 100644 --- a/ntex/src/http/client/h2proto.rs +++ b/ntex/src/http/client/h2proto.rs @@ -187,14 +187,17 @@ async fn get_response( err ); pl.set_error( - io::Error::new(io::ErrorKind::Other, err) - .into(), + io::Error::new( + io::ErrorKind::UnexpectedEof, + err, + ) + .into(), ); } _ => { pl.set_error( io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::Unsupported, "unexpected h2 message", ) .into(), @@ -216,7 +219,7 @@ async fn get_response( } } _ => Err(SendRequestError::Error(Box::new(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::Unsupported, "unexpected h2 message", )))), } diff --git a/ntex/src/http/encoding/encoder.rs b/ntex/src/http/encoding/encoder.rs index 92003e60..7c24edf3 100644 --- a/ntex/src/http/encoding/encoder.rs +++ b/ntex/src/http/encoding/encoder.rs @@ -117,7 +117,7 @@ impl MessageBody for Encoder { Poll::Ready(Ok(Err(e))) => return Poll::Ready(Some(Err(Box::new(e)))), Poll::Ready(Err(_)) => { return Poll::Ready(Some(Err(Box::new(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::Interrupted, "Canceled", ))))); } diff --git a/ntex/src/http/error.rs b/ntex/src/http/error.rs index 85642d6c..f1eba14a 100644 --- a/ntex/src/http/error.rs +++ b/ntex/src/http/error.rs @@ -217,7 +217,7 @@ pub enum BlockingError { impl From for PayloadError { fn from(_: crate::rt::JoinError) -> Self { PayloadError::Io(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::Interrupted, "Operation is canceled", )) } @@ -228,7 +228,7 @@ impl From> for PayloadError { match err { BlockingError::Error(e) => PayloadError::Io(e), BlockingError::Canceled => PayloadError::Io(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::Interrupted, "Operation is canceled", )), } diff --git a/ntex/src/http/h2/service.rs b/ntex/src/http/h2/service.rs index 2ca77f4e..8c32e3f4 100644 --- a/ntex/src/http/h2/service.rs +++ b/ntex/src/http/h2/service.rs @@ -408,7 +408,9 @@ where h2::MessageKind::Disconnect(err) => { log::debug!("Connection is disconnected {:?}", err); 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(()); } diff --git a/ntex/src/web/server.rs b/ntex/src/web/server.rs index 9efe14cb..5b774b97 100644 --- a/ntex/src/web/server.rs +++ b/ntex/src/web/server.rs @@ -467,7 +467,7 @@ where Err(e) } else { Err(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::InvalidInput, "Cannot bind to address.", )) } diff --git a/ntex/src/ws/transport.rs b/ntex/src/ws/transport.rs index f6e27f7a..78473fab 100644 --- a/ntex/src/ws/transport.rs +++ b/ntex/src/ws/transport.rs @@ -54,7 +54,7 @@ impl WsTransport { Ok(()) } else { 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| { log::trace!("Failed to decode ws codec frames: {:?}", e); self.insert_flags(Flags::PROTO_ERR); - io::Error::new(io::ErrorKind::Other, e) + io::Error::new(io::ErrorKind::InvalidData, e) })? { frame } else { @@ -123,14 +123,14 @@ impl FilterLayer for WsTransport { Frame::Continuation(Item::FirstText(_)) => { self.insert_flags(Flags::PROTO_ERR); return Err(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::InvalidData, "WebSocket Text continuation frames are not supported", )); } Frame::Text(_) => { self.insert_flags(Flags::PROTO_ERR); return Err(io::Error::new( - io::ErrorKind::Other, + io::ErrorKind::InvalidData, "WebSockets Text frames are not supported", )); }