From 89e9134a3f2cb3caebab93b600c26b72655beeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Fri, 4 Dec 2020 09:11:29 +0100
Subject: [PATCH] hyper: use new hyper::upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the old Body::on_upgrade method is no more

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/api2/backup.rs        | 5 ++---
 src/api2/node.rs          | 5 +++--
 src/api2/reader.rs        | 5 ++---
 src/client/http_client.rs | 5 +----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/api2/backup.rs b/src/api2/backup.rs
index f4eed074..bf9c1465 100644
--- a/src/api2/backup.rs
+++ b/src/api2/backup.rs
@@ -2,7 +2,7 @@ use anyhow::{bail, format_err, Error};
 use futures::*;
 use hyper::header::{HeaderValue, UPGRADE};
 use hyper::http::request::Parts;
-use hyper::{Body, Response, StatusCode};
+use hyper::{Body, Response, Request, StatusCode};
 use serde_json::{json, Value};
 
 use proxmox::{sortable, identity, list_subdirs_api_method};
@@ -171,8 +171,7 @@ async move {
 
         let env2 = env.clone();
 
-        let mut req_fut = req_body
-            .on_upgrade()
+        let mut req_fut = hyper::upgrade::on(Request::from_parts(parts, req_body))
             .map_err(Error::from)
             .and_then(move |conn| {
                 env2.debug("protocol upgrade done");
diff --git a/src/api2/node.rs b/src/api2/node.rs
index 51dfdd19..78e0fa44 100644
--- a/src/api2/node.rs
+++ b/src/api2/node.rs
@@ -6,6 +6,7 @@ use futures::future::{FutureExt, TryFutureExt};
 use hyper::body::Body;
 use hyper::http::request::Parts;
 use hyper::upgrade::Upgraded;
+use hyper::Request;
 use serde_json::{json, Value};
 use tokio::io::{AsyncBufReadExt, BufReader};
 
@@ -292,10 +293,10 @@ fn upgrade_to_websocket(
                 Some(&ticket::term_aad(&userid, "/system", port)),
             )?;
 
-        let (ws, response) = WebSocket::new(parts.headers)?;
+        let (ws, response) = WebSocket::new(parts.headers.clone())?;
 
         crate::server::spawn_internal_task(async move {
-            let conn: Upgraded = match req_body.on_upgrade().map_err(Error::from).await {
+            let conn: Upgraded = match hyper::upgrade::on(Request::from_parts(parts, req_body)).map_err(Error::from).await {
                 Ok(upgraded) => upgraded,
                 _ => bail!("error"),
             };
diff --git a/src/api2/reader.rs b/src/api2/reader.rs
index 010d73e3..72b6e33a 100644
--- a/src/api2/reader.rs
+++ b/src/api2/reader.rs
@@ -2,7 +2,7 @@ use anyhow::{bail, format_err, Error};
 use futures::*;
 use hyper::header::{self, HeaderValue, UPGRADE};
 use hyper::http::request::Parts;
-use hyper::{Body, Response, StatusCode};
+use hyper::{Body, Response, Request, StatusCode};
 use serde_json::Value;
 
 use proxmox::{sortable, identity};
@@ -130,8 +130,7 @@ fn upgrade_to_backup_reader_protocol(
 
             let abort_future = worker.abort_future();
 
-            let req_fut = req_body
-                .on_upgrade()
+            let req_fut = hyper::upgrade::on(Request::from_parts(parts, req_body))
                 .map_err(Error::from)
                 .and_then({
                     let env = env.clone();
diff --git a/src/client/http_client.rs b/src/client/http_client.rs
index 33860abf..3a934062 100644
--- a/src/client/http_client.rs
+++ b/src/client/http_client.rs
@@ -646,10 +646,7 @@ impl HttpClient {
             bail!("unknown error");
         }
 
-        let upgraded = resp
-            .into_body()
-            .on_upgrade()
-            .await?;
+        let upgraded = hyper::upgrade::on(resp).await?;
 
         let max_window_size = (1 << 31) - 2;