From 888a28d53b5c2c70e2956a9a8feada764cae4607 Mon Sep 17 00:00:00 2001
From: Darius Auding <Darius.auding@gmx.de>
Date: Fri, 21 Jul 2023 22:22:20 +0200
Subject: [PATCH] Removing unnecessary function `write_unencrypted` due to
replacement with generic write on response. Removing unnecessary imports
---
core/http/src/handling/response/build_and_write.rs | 8 +-------
core/http/src/setup.rs | 8 ++++++--
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/core/http/src/handling/response/build_and_write.rs b/core/http/src/handling/response/build_and_write.rs
index 1d9e162..a8cdb09 100644
--- a/core/http/src/handling/response/build_and_write.rs
+++ b/core/http/src/handling/response/build_and_write.rs
@@ -1,6 +1,6 @@
use std::io::Result;
-use tokio::{io::{AsyncWriteExt, AsyncRead, AsyncWrite}, net::TcpStream};
+use tokio::io::{AsyncWriteExt, AsyncRead, AsyncWrite};
use crate::handling::{methods::Method, request::Request, response::Status};
@@ -37,10 +37,4 @@ impl Response {
stream.write_all(&resp).await?;
Ok(())
}
-
- pub async fn write_unencrypted(self, mut stream: TcpStream) -> Result<()> {
- let resp = self.build(None);
- stream.write_all(&resp).await?;
- Ok(())
- }
}
diff --git a/core/http/src/setup.rs b/core/http/src/setup.rs
index f451ed4..9802f0e 100644
--- a/core/http/src/setup.rs
+++ b/core/http/src/setup.rs
@@ -1,4 +1,4 @@
-use std::{thread::available_parallelism};
+use std::thread::available_parallelism;
use tokio::{
net::TcpListener,
@@ -6,12 +6,16 @@ use tokio::{
signal::unix::{signal, SignalKind, Signal},
};
+#[cfg(feature = "secure")]
use tokio_native_tls::{native_tls::{Identity, self}, TlsAcceptor};
use crate::{
handlers::handler::handle_connection,
- handling::{routes::{Route, Uri}, response::{Response, Status}},
+ handling::routes::{Route, Uri},
};
+#[cfg(feature = "secure")]
+use crate::handling::response::{Response, Status};
+
#[derive(Clone)]
/// Represnts a [MountPoint] that can be mounted in the config
--
GitLab