diff --git a/Cargo.lock b/Cargo.lock index 6d538b07..015fbaf6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -945,7 +945,7 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.5" +version = "0.26.6" dependencies = [ "argh", "futures-util", diff --git a/Cargo.toml b/Cargo.toml index e962b9e8..72766dc0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tokio-rustls" -version = "0.26.5" +version = "0.26.6" license = "MIT OR Apache-2.0" repository = "https://github.com/rustls/tokio-rustls" homepage = "https://github.com/rustls/tokio-rustls" diff --git a/src/client.rs b/src/client.rs index 4e363c54..2bd36592 100644 --- a/src/client.rs +++ b/src/client.rs @@ -106,7 +106,7 @@ impl TlsConnector { }, need_flush: false, - buffered_err: None, + error: None, #[cfg(feature = "early-data")] early_waker: None, @@ -237,7 +237,8 @@ pub struct TlsStream { pub(crate) session: ClientConnection, pub(crate) state: TlsState, pub(crate) need_flush: bool, - pub(crate) buffered_err: Option, + /// Buffered error that occurred during batch reading + pub(crate) error: Option, #[cfg(feature = "early-data")] pub(crate) early_waker: Option, @@ -337,7 +338,7 @@ where cx: &mut Context<'_>, buf: &mut ReadBuf<'_>, ) -> Poll> { - if let Some(err) = self.buffered_err.take() { + if let Some(err) = self.error.take() { return Poll::Ready(Err(err)); }; let data = ready!(self.as_mut().poll_fill_buf(cx))?; @@ -353,7 +354,7 @@ where Poll::Ready(Ok([])) => break, Poll::Ready(Ok(data)) => data, Poll::Ready(Err(err)) => { - self.buffered_err = Some(err); + self.error = Some(err); break; } Poll::Pending => break, diff --git a/src/server.rs b/src/server.rs index 45dc86ee..c24c4890 100644 --- a/src/server.rs +++ b/src/server.rs @@ -76,7 +76,7 @@ impl TlsAcceptor { io: stream, state: TlsState::Stream, need_flush: false, - buffered_err: None, + error: None, })) } @@ -305,7 +305,7 @@ where io: self.io, state: TlsState::Stream, need_flush: false, - buffered_err: None, + error: None, })) } } @@ -368,7 +368,8 @@ pub struct TlsStream { pub(crate) session: ServerConnection, pub(crate) state: TlsState, pub(crate) need_flush: bool, - pub(crate) buffered_err: Option, + /// Buffered error that occurred during batch reading + pub(crate) error: Option, } impl TlsStream { @@ -422,7 +423,7 @@ where cx: &mut Context<'_>, buf: &mut ReadBuf<'_>, ) -> Poll> { - if let Some(err) = self.buffered_err.take() { + if let Some(err) = self.error.take() { return Poll::Ready(Err(err)); }; let data = ready!(self.as_mut().poll_fill_buf(cx))?; @@ -438,7 +439,7 @@ where Poll::Ready(Ok([])) => break, Poll::Ready(Ok(data)) => data, Poll::Ready(Err(err)) => { - self.buffered_err = Some(err); + self.error = Some(err); break; } Poll::Pending => break,