Host header is now stored per-request instead of globally.

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 858f0b61e0aee2332196023cad3b619174fae366..73f956c31af193871dbc825111b76bd0981a4d9d 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -3,7 +3,7 @@
  * waiting on the specified port for incoming HTTP connections.  When a
  * connection is established, it calls context_loop() from context_loop.c.
  *
- * Copyright (c) 1996-2010 by the citadel.org developers.
+ * Copyright (c) 1996-2011 by the citadel.org developers.
  * This program is released under the terms of the GNU General Public License v3.
  *
  */
@@ -24,7 +24,6 @@ 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;
 
@@ -216,6 +215,12 @@ int main(int argc, char **argv)
                        return 1;
                }
 
+       /* Start the logger */
+       openlog("webcit",
+               ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
+               LOG_DAEMON
+       );
+
        if (optind < argc) {
                ctdlhost = argv[optind];
                if (++optind < argc)
@@ -236,16 +241,26 @@ int main(int argc, char **argv)
 
        /* Tell 'em who's in da house */
        lprintf(1, PACKAGE_STRING "\n");
-       lprintf(1, "Copyright (C) 1996-2010 by the Citadel development team.\n"
-               "This software is distributed under the terms of the "
-               "GNU General Public License.\n\n"
-       );
-
-
-       /* initialize the International Bright Young Thing */
+       lprintf(1, "Copyright (C) 1996-2011 by the citadel.org team\n");
+       lprintf(1, "\n");
+       lprintf(1, "This program is open source  software: you can redistribute it and/or\n");
+       lprintf(1, "modify it under the terms of the GNU General Public License as published\n");
+       lprintf(1, "by the Free Software Foundation, either version 3 of the License, or\n");
+       lprintf(1, "(at your option) any later version.\n");
+       lprintf(1, "\n");
+       lprintf(1, "This program is distributed in the hope that it will be useful,\n");
+       lprintf(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+       lprintf(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n");
+       lprintf(1, "GNU General Public License for more details.\n");
+       lprintf(1, "\n");
+       lprintf(1, "You should have received a copy of the GNU General Public License\n");
+       lprintf(1, "along with this program.  If not, see <http://www.gnu.org/licenses/>.\n");
+       lprintf(1, "\n");
+
+
+       /* initialize various subsystems */
 
        initialise_modules();
-
        InitTemplateCache();
        if (DumpTemplateI18NStrings) {
                FILE *fd;