forward-port r4a30bae41553 from stable

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 97c1bfb12308e9e1f0372b89df3710af36deb35e..858f0b61e0aee2332196023cad3b619174fae366 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This contains a simple multithreaded TCP server manager.  It sits around
  * waiting on the specified port for incoming HTTP connections.  When a
  * connection is established, it calls context_loop() from context_loop.c.
@@ -22,17 +20,17 @@ int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
 extern int msock;                      /* master listening socket */
 extern int verbosity;          /* Logging level */
 extern char static_icon_dir[PATH_MAX];          /* where should we find our mime icons */
-extern long MaxRead; 
 int is_https = 0;              /* Nonzero if I am an HTTPS service */
 int follow_xff = 0;            /* Follow X-Forwarded-For: header */
 int home_specified = 0;                /* did the user specify a homedir? */
 int DisableGzip = 0;
+StrBuf *site_prefix = NULL;
 extern pthread_mutex_t SessionListMutex;
 extern pthread_key_t MyConKey;
 
 extern void *housekeeping_loop(void);
-extern int ig_tcp_server(char *ip_addr, int port_number, int queue_len);
-extern int ig_uds_server(char *sockpath, int queue_len);
+extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len);
+extern int webcit_uds_server(char *sockpath, int queue_len);
 extern void graceful_shutdown_watcher(int signum);
 extern void graceful_shutdown(int signum);
 extern void start_daemon(char *pid_file);
@@ -59,7 +57,7 @@ const char foobuf[32];
 const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
 #endif 
 extern int dbg_analyze_msg;
-extern int dbg_bactrace_template_errors;
+extern int dbg_backtrace_template_errors;
 extern int DumpTemplateI18NStrings;
 extern StrBuf *I18nDump;
 void InitTemplateCache(void);
@@ -77,9 +75,9 @@ int main(int argc, char **argv)
        size_t basesize = 2;            /* how big should strbufs be on creation? */
        pthread_t SessThread;           /* Thread descriptor */
        pthread_attr_t attr;            /* Thread attributes */
-       int a, i;                       /* General-purpose variables */
+       int a;                          /* General-purpose variable */
        char tracefile[PATH_MAX];
-       char ip_addr[256]="0.0.0.0";
+       char ip_addr[256]="*";
        int relh=0;
        int home=0;
        int home_specified=0;
@@ -114,9 +112,9 @@ int main(int argc, char **argv)
 
        /* Parse command line */
 #ifdef HAVE_OPENSSL
-       while ((a = getopt(argc, argv, "R:u:h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
 #else
-       while ((a = getopt(argc, argv, "R:u:h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
 #endif
                switch (a) {
                case 'u':
@@ -165,7 +163,7 @@ int main(int argc, char **argv)
                case 'T':
                        LoadTemplates = atoi(optarg);
                        dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
-                       dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+                       dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
                        break;
                case 'Z':
                        DisableGzip = 1;
@@ -205,9 +203,6 @@ int main(int argc, char **argv)
                        I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
                        I18nDumpFile = optarg;
                        break;
-               case 'R':
-                       MaxRead = atol(optarg);
-                       break;
                default:
                        fprintf(stderr, "usage: webcit "
                                "[-i ip_addr] [-p http_port] "
@@ -250,8 +245,6 @@ int main(int argc, char **argv)
        /* initialize the International Bright Young Thing */
 
        initialise_modules();
-       initialize_viewdefs();
-       initialize_axdefs();
 
        InitTemplateCache();
        if (DumpTemplateI18NStrings) {
@@ -259,7 +252,7 @@ int main(int argc, char **argv)
                StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
                if (StrLength(I18nDump) < 50) {
                        lprintf(1, "********************************************************************************\n");
-                       lprintf(1, "*        No strings found in templates! are you shure they're there?           *\n");
+                       lprintf(1, "*        No strings found in templates!  Are you sure they're there?           *\n");
                        lprintf(1, "********************************************************************************\n");
                        return -1;
                }
@@ -306,17 +299,17 @@ int main(int argc, char **argv)
 
        /*
         * Bind the server to our favorite port.
-        * There is no need to check for errors, because ig_tcp_server()
+        * There is no need to check for errors, because webcit_tcp_server()
         * exits if it doesn't succeed.
         */
 
        if (!IsEmptyStr(uds_listen_path)) {
                lprintf(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
-               msock = ig_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
+               msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
        }
        else {
                lprintf(2, "Attempting to bind to port %d...\n", http_port);
-               msock = ig_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
+               msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
        }
        if (msock < 0)
        {
@@ -348,12 +341,7 @@ int main(int argc, char **argv)
 #endif
        drop_root(UID);
 
-       /* Start a few initial worker threads */
-       for (i = 0; i < (MIN_WORKER_THREADS); ++i) {
-               spawn_another_worker_thread();
-       }
-
-       /* now the original thread becomes another worker */
+       /* Become a worker thread.  More worker threads will be spawned as they are needed. */
        worker_entry();
        ShutDownLibCitadel ();
        return 0;