Merge remote-tracking branch 'origin/main'

Author: NightPotato

.idea/workspace.xml

@@ -17,6 +17,7 @@ derive_more = { version = "2.0.1", features = ["full"] }
 clap = { version = "4.5.28", features = ["derive"] }
 clap-verbosity-flag = { version = "3.0.2", features = ["tracing"] }
 rcgen = "0.13.2"
+dav-server = { git = "https://github.com/messense/dav-server-rs.git" }
 
 [dev-dependencies]
 rusty-hook = "^0.11.2"

Cargo.toml

@@ -25,7 +25,10 @@ struct GitServer {
 }
 
 /// Main entry point: chooses between TLS mode and plain HTTP.
-pub async fn launch(mut config: crate::config::Config) {
+#[allow(unused_variables)]
+// allow unused variables because we currently only need the config if the https feature
+// is enabled
+pub async fn launch(config: crate::config::Config) {
     // For TLS mode, config.port is the HTTPS port (e.g. 443)
     let https_addr = SocketAddr::from(([0, 0, 0, 0], 443));
     // Use port 80 for HTTP redirection.
@@ -52,8 +55,13 @@ pub async fn launch(mut config: crate::config::Config) {
             let redirect_router = redirect_router.into_make_service();
 
             let https_server = run_https(https_addr, https_router.into_make_service());
-            let http_redirect_server = run_http_redirect(http_addr, redirect_router);
-            tokio::join!(https_server, http_redirect_server);
+            match config.http_redirect {
+                true => {
+                    let http_redirect_server = run_http_redirect(http_addr, redirect_router);
+                    tokio::join!(https_server, http_redirect_server);
+                }
+                false => tokio::task::block_in_place(move || https_server).await,
+            }
         }
     } else {
         // Run only a plain HTTP server.