diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /netwerk/socket/neqo_glue/src/lib.rs | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netwerk/socket/neqo_glue/src/lib.rs')
| -rw-r--r-- | netwerk/socket/neqo_glue/src/lib.rs | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/netwerk/socket/neqo_glue/src/lib.rs b/netwerk/socket/neqo_glue/src/lib.rs index fd527a7fb9..9f11a783be 100644 --- a/netwerk/socket/neqo_glue/src/lib.rs +++ b/netwerk/socket/neqo_glue/src/lib.rs @@ -671,11 +671,11 @@ impl From<TransportError> for CloseError { } } -impl From<neqo_transport::ConnectionError> for CloseError { - fn from(error: neqo_transport::ConnectionError) -> CloseError { +impl From<neqo_transport::CloseReason> for CloseError { + fn from(error: neqo_transport::CloseReason) -> CloseError { match error { - neqo_transport::ConnectionError::Transport(c) => c.into(), - neqo_transport::ConnectionError::Application(c) => CloseError::AppError(c), + neqo_transport::CloseReason::Transport(c) => c.into(), + neqo_transport::CloseReason::Application(c) => CloseError::AppError(c), } } } @@ -1056,12 +1056,11 @@ pub extern "C" fn neqo_http3conn_event( Http3State::Connected => Http3Event::ConnectionConnected, Http3State::Closing(error_code) => { match error_code { - neqo_transport::ConnectionError::Transport( - TransportError::CryptoError(neqo_crypto::Error::EchRetry(ref c)), - ) - | neqo_transport::ConnectionError::Transport(TransportError::EchRetry( - ref c, - )) => { + neqo_transport::CloseReason::Transport(TransportError::CryptoError( + neqo_crypto::Error::EchRetry(ref c), + )) + | neqo_transport::CloseReason::Transport(TransportError::EchRetry(ref c)) => + { data.extend_from_slice(c.as_ref()); } _ => {} @@ -1072,12 +1071,11 @@ pub extern "C" fn neqo_http3conn_event( } Http3State::Closed(error_code) => { match error_code { - neqo_transport::ConnectionError::Transport( - TransportError::CryptoError(neqo_crypto::Error::EchRetry(ref c)), - ) - | neqo_transport::ConnectionError::Transport(TransportError::EchRetry( - ref c, - )) => { + neqo_transport::CloseReason::Transport(TransportError::CryptoError( + neqo_crypto::Error::EchRetry(ref c), + )) + | neqo_transport::CloseReason::Transport(TransportError::EchRetry(ref c)) => + { data.extend_from_slice(c.as_ref()); } _ => {} |