From c474a66b41b63fc1ca70bc259e9c05406f5080f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Fri, 14 May 2021 15:44:50 +0200
Subject: [PATCH] move websocket to new 'proxmox_http' crate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 Cargo.toml       | 5 +++--
 debian/control   | 3 ++-
 src/api2/node.rs | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cd99241e..7059fee2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -53,10 +53,11 @@ percent-encoding = "2.1"
 pin-utils = "0.1.0"
 pin-project = "1.0"
 pathpatterns = "0.1.2"
-proxmox = { version = "0.11.4", features = [ "sortable-macro", "api-macro", "websocket" ] }
+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", "websocket" ] }
+#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 = [ "websocket" ] }
 pxar = { version = "0.10.1", features = [ "tokio-io" ] }
 #pxar = { path = "../pxar", features = [ "tokio-io" ] }
 regex = "1.2"
diff --git a/debian/control b/debian/control
index 3f1edba8..a02518fe 100644
--- a/debian/control
+++ b/debian/control
@@ -42,9 +42,10 @@ Build-Depends: debhelper (>= 11),
  librust-proxmox-0.11+api-macro-dev (>= 0.11.4-~~),
  librust-proxmox-0.11+default-dev (>= 0.11.4-~~),
  librust-proxmox-0.11+sortable-macro-dev (>= 0.11.4-~~),
- librust-proxmox-0.11+websocket-dev (>= 0.11.4-~~),
  librust-proxmox-acme-rs-0.2+default-dev (>= 0.2.1-~~),
  librust-proxmox-fuse-0.1+default-dev (>= 0.1.1-~~),
+ librust-proxmox-http-0.1+default-dev,
+ librust-proxmox-http-0.1+websocket-dev,
  librust-pxar-0.10+default-dev (>= 0.10.1-~~),
  librust-pxar-0.10+tokio-io-dev (>= 0.10.1-~~),
  librust-regex-1+default-dev (>= 1.2-~~),
diff --git a/src/api2/node.rs b/src/api2/node.rs
index 75271cd5..af9ecf69 100644
--- a/src/api2/node.rs
+++ b/src/api2/node.rs
@@ -17,7 +17,7 @@ use proxmox::api::{
     api, schema::*, ApiHandler, ApiMethod, ApiResponseFuture, Permission, RpcEnvironment,
 };
 use proxmox::list_subdirs_api_method;
-use proxmox::tools::websocket::WebSocket;
+use proxmox_http::websocket::WebSocket;
 use proxmox::{identity, sortable};
 
 use crate::api2::types::*;