Add option to build httpserver

haiwen · Mar 6, 2024 · f4bcd33 · f4bcd33
1 parent b2bd7b7
commit f4bcd33
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -91,10 +91,12 @@ AC_ARG_WITH(mysql,
             [MYSQL_CONFIG=$with_mysql],
 	    [MYSQL_CONFIG="default_mysql_config"])
 
+AC_ARG_ENABLE(httpserver, AC_HELP_STRING([--enable-httpserver], [enable httpserver]),
+   [compile_httpserver=$enableval],[compile_httpserver="yes"])
+
 AM_CONDITIONAL([COMPILE_TOOLS], [test "${compile_tools}" = "yes"])
 AM_CONDITIONAL([COMPILE_PYTHON], [test "${compile_python}" = "yes"])
 AM_CONDITIONAL([COMPILE_FUSE], [test "${compile_fuse}" = "yes"])
-
 AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
 AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
 AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
@@ -260,6 +262,10 @@ if test "${compile_ldap}" = "yes"; then
 
 fi
 
+if test "${compile_httpserver}" = "yes"; then
+    AC_DEFINE([HAVE_EVHTP], [1], [Define to 1 if httpserver is enabled.])
+fi
+
 PKG_CHECK_MODULES(CURL, [libcurl >= $CURL_REQUIRED])
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)

diff --git a/server/access-file.c b/server/access-file.c
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#ifdef HAVE_EVHTP
 #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
 #include "log.h"
 
@@ -1546,3 +1547,4 @@ access_file_init (evhtp_t *htp)
 
     return 0;
 }
+#endif
diff --git a/server/access-file.h b/server/access-file.h
@@ -1,7 +1,9 @@
 #ifndef ACCESS_FILE_H
 #define ACCESS_FILE_H
 
+#ifdef HAVE_EVHTP
 int
 access_file_init (evhtp_t *htp);
+#endif
 
 #endif
diff --git a/server/http-server.c b/server/http-server.c
@@ -12,7 +12,9 @@
 #include <event.h>
 #endif
 
+#ifdef HAVE_EVHTP
 #include <evhtp.h>
+#endif
 
 #include <jwt.h>
 
@@ -61,8 +63,11 @@
 #define FS_ID_LIST_TOKEN_LEN 36
 
 struct _HttpServer {
+#ifdef HAVE_EVHTP
     evbase_t *evbase;
     evhtp_t *evhtp;
+    event_t *reap_timer;
+#endif
     pthread_t thread_id;
 
     GHashTable *token_cache;
@@ -74,8 +79,6 @@ struct _HttpServer {
     GHashTable *vir_repo_info_cache;
     pthread_mutex_t vir_repo_info_cache_lock;
 
-    event_t *reap_timer;
-
     GThreadPool *compute_fs_obj_id_pool;
 
     GHashTable *fs_obj_ids;
@@ -292,6 +295,7 @@ load_http_config (HttpServerStruct *htp_server, SeafileSession *session)
     }
 }
 
+#ifdef HAVE_EVHTP
 static int
 validate_token (HttpServer *htp_server, evhtp_request_t *req,
                 const char *repo_id, char **username,
@@ -2872,6 +2876,7 @@ http_request_init (HttpServerStruct *server)
     if (upload_file_init (priv->evhtp, server->http_temp_dir) < 0)
         exit(-1);
 }
+#endif
 
 static void
 token_cache_value_free (gpointer data)
@@ -2963,6 +2968,7 @@ remove_expire_cache_cb (evutil_socket_t sock, short type, void *data)
 static void *
 http_server_run (void *arg)
 {
+#ifdef HAVE_EVHTP
     HttpServerStruct *server = arg;
     HttpServer *priv = server->priv;
 
@@ -2992,6 +2998,7 @@ http_server_run (void *arg)
 
     event_base_loop (priv->evbase, 0);
 
+#endif
     return NULL;
 }
 
@@ -3001,8 +3008,10 @@ seaf_http_server_new (struct _SeafileSession *session)
     HttpServerStruct *server = g_new0 (HttpServerStruct, 1);
     HttpServer *priv = g_new0 (HttpServer, 1);
 
+#ifdef HAVE_EVHTP
     priv->evbase = NULL;
     priv->evhtp = NULL;
+#endif
 
     load_http_config (server, session);
 

diff --git a/server/http-server.h b/server/http-server.h
@@ -36,7 +36,9 @@ int
 seaf_http_server_invalidate_tokens (HttpServerStruct *htp_server,
                                     const GList *tokens);
 
+#ifdef HAVE_EVHTP
 void
 send_statistic_msg (const char *repo_id, char *user, char *operation, guint64 bytes);
+#endif
 
 #endif
diff --git a/server/upload-file.c b/server/upload-file.c
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#ifdef HAVE_EVHTP
 #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
 #include "log.h"
 
@@ -2697,3 +2698,4 @@ upload_file_init (evhtp_t *htp, const char *http_temp_dir)
 
     return 0;
 }
+#endif
diff --git a/server/upload-file.h b/server/upload-file.h
@@ -1,7 +1,9 @@
 #ifndef UPLOAD_FILE_H
 #define UPLOAD_FILE_H
 
+#ifdef HAVE_EVHTP
 int
 upload_file_init (evhtp_t *evhtp, const char *http_temp_dir);
+#endif
 
 #endif