YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 10:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_http network: avoid infinite loop case; minor other changes

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-04 15:04:31 +02:00
parent 656efc7d4e
commit 8ebfb1d0ce
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
aquatic_http/src/lib/network/connection.rs
View file

@ -170,6 +170,8 @@ impl <'a>TlsHandshakeMachine {
Stream::TlsStream(stream)
);
::log::debug!("established tcp connection");
Ok(established)
},
Err(native_tls::HandshakeError::WouldBlock(handshake)) => {
@ -217,6 +219,8 @@ impl Connection {
TlsHandshakeMachine::new(tls_acceptor.clone(), tcp_stream)
)
} else {
::log::debug!("established tcp connection");
ConnectionInner::Established(
EstablishedConnection::new(Stream::TcpStream(tcp_stream))
)
@ -259,6 +263,7 @@ impl Connection {
}
}
/// Takes ownership since TlsStream needs ownership of TcpStream
#[inline]
pub fn get_in_progress(self) -> Option<TlsHandshakeMachine> {
if let ConnectionInner::InProgress(machine) = self.inner {