X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=3a896b4726e7cc37fdea541ed8808d8e032a7e37;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=ef1c5eb8e66cd4ef1b19eccaff7f80c76b59397a;hpb=d04995c5146e2987bea4875e88c5e6da04ecc048;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index ef1c5eb8e..3a896b472 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,11 +1,13 @@
 /*
- * 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-2012 by the citadel.org team
  *
- * Copyright (c) 1996-2011 by the citadel.org developers.
- * This program is released under the terms of the GNU General Public License v3.
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "webcit.h"
@@ -16,14 +18,12 @@
 int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
 #endif
 
-
 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 */
 int is_https = 0;				/* Nonzero if I am an HTTPS service */
 int follow_xff = 0;				/* Follow X-Forwarded-For: header? */
 int DisableGzip = 0;
-char *default_landing_page = NULL;		/* FIXME we need to populate this somehow */
+char *default_landing_page = NULL;
 extern pthread_mutex_t SessionListMutex;
 extern pthread_key_t MyConKey;
 
@@ -46,7 +46,6 @@ int setup_wizard = 0;		/* should we run the setup wizard? */
 char wizard_filename[PATH_MAX];	/* location of file containing the last webcit version against which we ran setup wizard */
 int running_as_daemon = 0;	/* should we deamonize on startup? */
 
-
 /* #define DBG_PRINNT_HOOKS_AT_START */
 #ifdef DBG_PRINNT_HOOKS_AT_START
 extern HashList *HandlerHash;
@@ -61,9 +60,6 @@ void InitTemplateCache(void);
 extern int LoadTemplates;
 
 
-
-
-
 /*
  * Here's where it all begins.
  */
@@ -74,7 +70,6 @@ int main(int argc, char **argv)
 	pthread_t SessThread;		/* Thread descriptor */
 	pthread_attr_t attr;		/* Thread attributes */
 	int a;		        	/* General-purpose variable */
-	char tracefile[PATH_MAX];
 	char ip_addr[256]="*";
 	int relh=0;
 	int home=0;
@@ -85,12 +80,10 @@ int main(int argc, char **argv)
 	const char *basedir = NULL;
 	char uds_listen_path[PATH_MAX];	/* listen on a unix domain socket? */
 	const char *I18nDumpFile = NULL;
-	FILE *rvfp = NULL;
-	int rv = 0;
 
 	WildFireInitBacktrace(argv[0], 2);
 
-	start_modules ();
+	start_modules();
 
 #ifdef DBG_PRINNT_HOOKS_AT_START
 /*	dbg_PrintHash(HandlerHash, nix, NULL);*/
@@ -154,10 +147,7 @@ int main(int argc, char **argv)
 			}
 			break;
 		case 't':
-			safestrncpy(tracefile, optarg, sizeof tracefile);
-			rvfp = freopen(tracefile, "w", stdout);
-			rvfp = freopen(tracefile, "w", stderr);
-			rvfp = freopen(tracefile, "r", stdin);
+			/* no longer used, but ignored so old scripts don't break */
 			break;
 		case 'T':
 			LoadTemplates = atoi(optarg);
@@ -168,7 +158,7 @@ int main(int argc, char **argv)
 			DisableGzip = 1;
 			break;
 		case 'x':
-			verbosity = atoi(optarg);
+			/* no longer used, but ignored so old scripts don't break */
 			break;
 		case 'f':
 			follow_xff = 1;
@@ -204,7 +194,7 @@ int main(int argc, char **argv)
 		default:
 			fprintf(stderr, "usage: webcit "
 				"[-i ip_addr] [-p http_port] "
-				"[-t tracefile] [-c] [-f] "
+				"[-c] [-f] "
 				"[-T Templatedebuglevel] "
 				"[-d] [-Z] [-G i18ndumpfile] "
 #ifdef HAVE_OPENSSL
@@ -240,7 +230,7 @@ int main(int argc, char **argv)
 
 	/* Tell 'em who's in da house */
 	syslog(1, "%s", PACKAGE_STRING);
-	syslog(1, "Copyright (C) 1996-2011 by the citadel.org team");
+	syslog(1, "Copyright (C) 1996-2012 by the citadel.org team");
 	syslog(1, " ");
 	syslog(1, "This program is open source software: you can redistribute it and/or");
 	syslog(1, "modify it under the terms of the GNU General Public License as published");
@@ -260,29 +250,29 @@ int main(int argc, char **argv)
 	/* initialize various subsystems */
 
 	initialise_modules();
+	initialise2_modules();
 	InitTemplateCache();
 	if (DumpTemplateI18NStrings) {
 		FILE *fd;
 		StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
 	        if (StrLength(I18nDump) < 50) {
-			syslog(1, "********************************************************************************\n");
-			syslog(1, "*        No strings found in templates!  Are you sure they're there?           *\n");
-			syslog(1, "********************************************************************************\n");
+			syslog(1, "*******************************************************************\n");
+			syslog(1, "*   No strings found in templates!  Are you sure they're there?   *\n");
+			syslog(1, "*******************************************************************\n");
 			return -1;
 		}
 		fd = fopen(I18nDumpFile, "w");
 	        if (fd == NULL) {
-			syslog(1, "********************************************************************************\n");
-			syslog(1, "*                  unable to open I18N dumpfile [%s]         *\n", I18nDumpFile);
-			syslog(1, "********************************************************************************\n");
+			syslog(1, "***********************************************\n");
+			syslog(1, "*   unable to open I18N dumpfile [%s]         *\n", I18nDumpFile);
+			syslog(1, "***********************************************\n");
 			return -1;
 		}
-		rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
+		fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
 		fclose(fd);
 		return 0;
 	}
 
-
 	/* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
 	icalerror_errors_are_fatal = 0;
 
@@ -295,9 +285,9 @@ int main(int argc, char **argv)
 	 * wcsession struct to which the thread is currently bound.
 	 */
 	if (pthread_key_create(&MyConKey, NULL) != 0) {
-		syslog(1, "Can't create TSD key: %s\n", strerror(errno));
+		syslog(1, "Can't create TSD key: %s", strerror(errno));
 	}
-	InitialiseSemaphores ();
+	InitialiseSemaphores();
 
 	/*
 	 * Set up a place to put thread-specific SSL data.
@@ -307,7 +297,7 @@ int main(int argc, char **argv)
 	 */
 #ifdef HAVE_OPENSSL
 	if (pthread_key_create(&ThreadSSL, NULL) != 0) {
-		syslog(1, "Can't create TSD key: %s\n", strerror(errno));
+		syslog(1, "Can't create TSD key: %s", strerror(errno));
 	}
 #endif
 
@@ -318,11 +308,11 @@ int main(int argc, char **argv)
 	 */
 
 	if (!IsEmptyStr(uds_listen_path)) {
-		syslog(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
+		syslog(2, "Attempting to create listener socket at %s...", uds_listen_path);
 		msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
 	}
 	else {
-		syslog(2, "Attempting to bind to port %d...\n", http_port);
+		syslog(2, "Attempting to bind to port %d...", http_port);
 		msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
 	}
 	if (msock < 0)
@@ -331,7 +321,7 @@ int main(int argc, char **argv)
 		return -msock;
 	}
 
-	syslog(2, "Listening on socket %d\n", msock);
+	syslog(2, "Listening on socket %d", msock);
 	signal(SIGPIPE, SIG_IGN);
 
 	pthread_mutex_init(&SessionListMutex, NULL);
@@ -341,9 +331,7 @@ int main(int argc, char **argv)
 	 */
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	pthread_create(&SessThread, &attr,
-		       (void *(*)(void *)) housekeeping_loop, NULL);
-
+	pthread_create(&SessThread, &attr, (void *(*)(void *)) housekeeping_loop, NULL);
 
 	/*
 	 * If this is an HTTPS server, fire up SSL