From 2bc557bbddb01b535dd8512fe3aadb0d4091a42d Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 28 Aug 2023 14:52:24 +0200 Subject: update all deps, including a new horrible version hyper --- src/proxy.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/proxy.rs') diff --git a/src/proxy.rs b/src/proxy.rs index 7070500..10d7e3d 100644 --- a/src/proxy.rs +++ b/src/proxy.rs @@ -1,4 +1,4 @@ -use crate::{ServiceError, State}; +use crate::{helper::TokioIo, ServiceError, State}; use http_body_util::{combinators::BoxBody, BodyExt}; use hyper::{ body::Incoming, @@ -51,9 +51,11 @@ pub async fn proxy_request( if let Some(_limit_guard) = state.l_outgoing.obtain() { debug!("\tforwarding to {}", backend); let mut resp = { - let client_stream = TcpStream::connect(backend) - .await - .map_err(|_| ServiceError::CantConnect)?; + let client_stream = TokioIo( + TcpStream::connect(backend) + .await + .map_err(|_| ServiceError::CantConnect)?, + ); let (mut sender, conn) = hyper::client::conn::http1::handshake(client_stream) .await @@ -77,11 +79,11 @@ pub async fn proxy_request( on_upgrade_upstream.unwrap().await, on_upgrade_downstream.unwrap().await, ) { - (Ok(mut upgraded_upstream), Ok(mut upgraded_downstream)) => { + (Ok(upgraded_upstream), Ok(upgraded_downstream)) => { debug!("upgrade successful"); match tokio::io::copy_bidirectional( - &mut upgraded_downstream, - &mut upgraded_upstream, + &mut TokioIo(upgraded_downstream), + &mut TokioIo(upgraded_upstream), ) .await { -- cgit v1.2.3-70-g09d2