From 1d781c5b20afd4dae597528350442eafb8f9e9f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 17 May 2021 11:29:24 +0200
Subject: [PATCH] update proxmox-http dependency

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---
 Cargo.toml                | 3 ++-
 src/acme/client.rs        | 2 +-
 src/api2/node/apt.rs      | 2 +-
 src/api2/types/mod.rs     | 2 +-
 src/client/http_client.rs | 4 ++--
 src/config/node.rs        | 2 +-
 src/tools.rs              | 2 +-
 src/tools/subscription.rs | 2 +-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2f2c2a81..b8bae1f5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,7 +57,8 @@ proxmox = { version = "0.11.5", features = [ "sortable-macro", "api-macro" ] }
 #proxmox = { git = "git://git.proxmox.com/git/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] }
 #proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro" ] }
 proxmox-fuse = "0.1.1"
-proxmox-http = { version = "0.1.0", path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] }
+proxmox-http = { version = "0.2.0", features = [ "client", "http-helpers", "websocket" ] }
+#proxmox-http = { version = "0.2.0", path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] }
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 #pxar = { path = "../pxar", features = [ "tokio-io" ] }
 regex = "1.2"
diff --git a/src/acme/client.rs b/src/acme/client.rs
index d1f46617..48ae6112 100644
--- a/src/acme/client.rs
+++ b/src/acme/client.rs
@@ -16,7 +16,7 @@ use proxmox_acme_rs::account::AccountData as AcmeAccountData;
 use proxmox_acme_rs::order::{Order, OrderData};
 use proxmox_acme_rs::Request as AcmeRequest;
 use proxmox_acme_rs::{Account, Authorization, Challenge, Directory, Error, ErrorResponse};
-use proxmox_http::http::client::SimpleHttp;
+use proxmox_http::client::SimpleHttp;
 
 use crate::api2::types::AcmeAccountName;
 use crate::config::acme::account_path;
diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs
index 9b2d1572..4bd911f4 100644
--- a/src/api2/node/apt.rs
+++ b/src/api2/node/apt.rs
@@ -7,7 +7,7 @@ use proxmox::api::{api, RpcEnvironment, RpcEnvironmentType, Permission};
 use proxmox::api::router::{Router, SubdirMap};
 use proxmox::tools::fs::{replace_file, CreateOptions};
 
-use proxmox_http::http::ProxyConfig;
+use proxmox_http::ProxyConfig;
 
 use crate::config::node;
 use crate::server::WorkerTask;
diff --git a/src/api2/types/mod.rs b/src/api2/types/mod.rs
index 26b99790..48aba561 100644
--- a/src/api2/types/mod.rs
+++ b/src/api2/types/mod.rs
@@ -1660,7 +1660,7 @@ pub struct NodeStatus {
 pub const HTTP_PROXY_SCHEMA: Schema = StringSchema::new(
     "HTTP proxy configuration [http://]<host>[:port]")
     .format(&ApiStringFormat::VerifyFn(|s| {
-        proxmox_http::http::ProxyConfig::parse_proxy_url(s)?;
+        proxmox_http::ProxyConfig::parse_proxy_url(s)?;
         Ok(())
     }))
     .min_length(1)
diff --git a/src/client/http_client.rs b/src/client/http_client.rs
index 4c548481..e05ee601 100644
--- a/src/client/http_client.rs
+++ b/src/client/http_client.rs
@@ -20,8 +20,8 @@ use proxmox::{
     tools::fs::{file_get_json, replace_file, CreateOptions},
 };
 
-use proxmox_http::http::client::HttpsConnector;
-use proxmox_http::http::helpers::build_authority;
+use proxmox_http::client::HttpsConnector;
+use proxmox_http::uri::build_authority;
 
 use super::pipe_to_stream::PipeToSendStream;
 use crate::api2::types::{Authid, Userid};
diff --git a/src/config/node.rs b/src/config/node.rs
index b003ae01..2e4205cd 100644
--- a/src/config/node.rs
+++ b/src/config/node.rs
@@ -10,7 +10,7 @@ use proxmox::api::api;
 use proxmox::api::schema::{ApiStringFormat, Updater};
 use proxmox::tools::fs::{replace_file, CreateOptions};
 
-use proxmox_http::http::ProxyConfig;
+use proxmox_http::ProxyConfig;
 
 use crate::acme::AcmeClient;
 use crate::api2::types::{
diff --git a/src/tools.rs b/src/tools.rs
index a9f57b88..65049b1e 100644
--- a/src/tools.rs
+++ b/src/tools.rs
@@ -18,7 +18,7 @@ use percent_encoding::{utf8_percent_encode, AsciiSet};
 pub use proxmox::tools::fd::Fd;
 use proxmox::tools::fs::{create_path, CreateOptions};
 
-use proxmox_http::http::{
+use proxmox_http::{
     client::SimpleHttp,
     client::SimpleHttpOptions,
     ProxyConfig,
diff --git a/src/tools/subscription.rs b/src/tools/subscription.rs
index c549c3dd..08917284 100644
--- a/src/tools/subscription.rs
+++ b/src/tools/subscription.rs
@@ -12,7 +12,7 @@ use crate::tools::{
     pbs_simple_http,
 };
 use proxmox::tools::fs::{replace_file, CreateOptions};
-use proxmox_http::http::client::SimpleHttp;
+use proxmox_http::client::SimpleHttp;
 
 /// How long the local key is valid for in between remote checks
 pub const MAX_LOCAL_KEY_AGE: i64 = 15 * 24 * 3600;