From 7c18b19eaeab0b48967314e5b4712a40530714bf Mon Sep 17 00:00:00 2001
From: Xiangyue Cai <caixiangyue007@gmail.com>
Date: Fri, 20 Dec 2019 10:24:52 +0800
Subject: [PATCH] fixed run seafdav

---
 controller/seafile-controller.c | 38 ++++++---------------------------
 controller/seafile-controller.h |  1 -
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/controller/seafile-controller.c b/controller/seafile-controller.c
index 54275a8..2b0462c 100644
--- a/controller/seafile-controller.c
+++ b/controller/seafile-controller.c
@@ -373,33 +373,17 @@ start_seafdav() {
 
     char *argv[] = {
         (char *)get_python_executable(),
-        "-m", "wsgidav.server.run_server",
-        "--log-file", seafdav_log_file,
+        "-m", "wsgidav.server.server_cli",
+        "--server", "gunicorn",
+        "--root", "/",
+        "--log-file", seafdav_log_file, 
         "--pid", ctl->pidfile[PID_SEAFDAV],
         "--port", port,
         "--host", conf.host,
         NULL
     };
 
-    char *argv_fastcgi[] = {
-        (char *)get_python_executable(),
-        "-m", "wsgidav.server.run_server",
-        "runfcgi",
-        "--log-file", seafdav_log_file,
-        "--pid", ctl->pidfile[PID_SEAFDAV],
-        "--port", port,
-        "--host", conf.host,
-        NULL
-    };
-
-    char **args;
-    if (ctl->seafdav_config.fastcgi) {
-        args = argv_fastcgi;
-    } else {
-        args = argv;
-    }
-
-    int pid = spawn_process (args);
+    int pid = spawn_process (argv);
 
     if (pid <= 0) {
         seaf_warning ("Failed to spawn seafdav\n");
@@ -746,21 +730,11 @@ read_seafdav_config()
         goto out;
     }
 
-    /* fastcgi */
-    ctl->seafdav_config.fastcgi = g_key_file_get_boolean(key_file, "WEBDAV", "fastcgi", &error);
-    if (error != NULL) {
-        if (error->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND) {
-            seaf_message ("Error when reading WEBDAV.fastcgi, use default value 'false'\n");
-        }
-        ctl->seafdav_config.fastcgi = FALSE;
-        g_clear_error (&error);
-    }
-
     /* host */
     char *host = seaf_key_file_get_string (key_file, "WEBDAV", "host", &error);
     if (error != NULL) {
         g_clear_error(&error);
-        ctl->seafdav_config.host = g_strdup(ctl->seafdav_config.fastcgi ? "localhost" : "0.0.0.0");
+        ctl->seafdav_config.host = g_strdup("0.0.0.0");
     } else {
         ctl->seafdav_config.host = host;
     }
diff --git a/controller/seafile-controller.h b/controller/seafile-controller.h
index 237947b..e9e9f22 100644
--- a/controller/seafile-controller.h
+++ b/controller/seafile-controller.h
@@ -32,7 +32,6 @@ enum {
 
 typedef struct SeafDavConfig {
     gboolean enabled;
-    gboolean fastcgi;
     int port;
     char *host;