From c79bcaae0433d4f13901540221af4e1830e1d44f Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Fri, 27 Aug 2021 18:23:14 +0200 Subject: Conditionally enable TLS only on supported platforms --- src/main.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 1432a1a..9b3d732 100644 --- a/src/main.rs +++ b/src/main.rs @@ -227,6 +227,12 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .default_service(web::get().to(error_404)) }); + #[cfg(any( + target_arch = "x86", + target_arch = "x86_64", + target_arch = "aarch64", + target_arch = "arm" + ))] let srv = if let Some(tls_config) = miniserve_config.tls_rustls_config { srv.bind_rustls(socket_addresses.as_slice(), tls_config) .map_err(|e| ContextualError::IoError("Failed to bind server".to_string(), e))? @@ -239,6 +245,18 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .run() }; + #[cfg(not(any( + target_arch = "x86", + target_arch = "x86_64", + target_arch = "aarch64", + target_arch = "arm" + )))] + let srv = srv + .bind(socket_addresses.as_slice()) + .map_err(|e| ContextualError::IoError("Failed to bind server".to_string(), e))? + .shutdown_timeout(0) + .run(); + println!( "Serving path {path} at {addresses}", path = Color::Yellow.paint(path_string).bold(), -- cgit v1.2.3 From 2ea23ceb416d2a6c84a752d5a36afaf754b7c644 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Sat, 28 Aug 2021 05:38:42 +0200 Subject: Switch TLS conditional compilation to feature --- src/main.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 9b3d732..c60e153 100644 --- a/src/main.rs +++ b/src/main.rs @@ -227,12 +227,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .default_service(web::get().to(error_404)) }); - #[cfg(any( - target_arch = "x86", - target_arch = "x86_64", - target_arch = "aarch64", - target_arch = "arm" - ))] + #[cfg(feature = "tls")] let srv = if let Some(tls_config) = miniserve_config.tls_rustls_config { srv.bind_rustls(socket_addresses.as_slice(), tls_config) .map_err(|e| ContextualError::IoError("Failed to bind server".to_string(), e))? @@ -245,12 +240,7 @@ async fn run(miniserve_config: MiniserveConfig) -> Result<(), ContextualError> { .run() }; - #[cfg(not(any( - target_arch = "x86", - target_arch = "x86_64", - target_arch = "aarch64", - target_arch = "arm" - )))] + #[cfg(not(feature = "tls"))] let srv = srv .bind(socket_addresses.as_slice()) .map_err(|e| ContextualError::IoError("Failed to bind server".to_string(), e))? -- cgit v1.2.3