diff options
Diffstat (limited to 'test_util/src/servers/ws.rs')
| -rw-r--r-- | test_util/src/servers/ws.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test_util/src/servers/ws.rs b/test_util/src/servers/ws.rs index 188216c86..f820c8bbd 100644 --- a/test_util/src/servers/ws.rs +++ b/test_util/src/servers/ws.rs @@ -11,10 +11,10 @@ use futures::future::join3; use futures::future::poll_fn; use futures::Future; use futures::StreamExt; -use h2_04::server::Handshake; -use h2_04::server::SendResponse; -use h2_04::Reason; -use h2_04::RecvStream; +use h2::server::Handshake; +use h2::server::SendResponse; +use h2::Reason; +use h2::RecvStream; use hyper1::upgrade::Upgraded; use hyper1::Method; use hyper1::Request; @@ -70,7 +70,7 @@ pub async fn run_wss2_server(port: u16) { .await; while let Some(Ok(tls)) = tls.next().await { tokio::spawn(async move { - let mut h2 = h2_04::server::Builder::new(); + let mut h2 = h2::server::Builder::new(); h2.enable_connect_protocol(); // Using Bytes is pretty alloc-heavy but this is a test server let server: Handshake<_, Bytes> = h2.handshake(tls); @@ -127,7 +127,7 @@ where S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static, { let service = hyper1::service::service_fn( - move |mut req: http_1::Request<hyper1::body::Incoming>| async move { + move |mut req: http::Request<hyper1::body::Incoming>| async move { let (response, upgrade_fut) = fastwebsockets::upgrade::upgrade(&mut req) .map_err(|e| anyhow!("Error upgrading websocket connection: {}", e))?; @@ -161,13 +161,13 @@ where async fn handle_wss_stream( recv: Request<RecvStream>, mut send: SendResponse<Bytes>, -) -> Result<(), h2_04::Error> { +) -> Result<(), h2::Error> { if recv.method() != Method::CONNECT { eprintln!("wss2: refusing non-CONNECT stream"); send.send_reset(Reason::REFUSED_STREAM); return Ok(()); } - let Some(protocol) = recv.extensions().get::<h2_04::ext::Protocol>() else { + let Some(protocol) = recv.extensions().get::<h2::ext::Protocol>() else { eprintln!("wss2: refusing no-:protocol stream"); send.send_reset(Reason::REFUSED_STREAM); return Ok(()); |
