push/pop destination_url instead of passing it through the chain

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index cfc1cb083b65ebe621c5c40fac768d35be3e4c36..b5973eac8371edd713247c914aec997419083567 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,11 +1,9 @@
 /*
- * $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.
  *
- * 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.
  *
  */
@@ -22,11 +20,11 @@ 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;
 
@@ -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);
@@ -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] "
@@ -221,6 +216,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)
@@ -241,16 +242,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;