X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fwebserver.c;h=612ac5d086507408efc3119001df8b84115bc917;hp=c70419b3be0d405c982abfbf537168a50109ca49;hb=8f0a07617656512ca31a029814d04fc254ca9d33;hpb=bec3ef98aa550c3beb4a762c789d0d0d6ea48910

diff --git a/webcit/webserver.c b/webcit/webserver.c
index c70419b3b..612ac5d08 100644
--- 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.
  *
  */
@@ -13,304 +11,136 @@
 #include "webcit.h"
 #include "webserver.h"
 
-#if HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
 #include "modules_init.h"
 #ifndef HAVE_SNPRINTF
 int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp);
 #endif
 
-int verbosity = 9;		/* Logging level */
-int msock;			/* master listening socket */
+
+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 home_specified = 0;		/* did the user specify a homedir? */
-int time_to_die = 0;            /* Nonzero if server is shutting down */
 int DisableGzip = 0;
-extern void *context_loop(ParsedHttpHdrs *Hdr);
-extern void *housekeeping_loop(void);
+struct redirector *redir = NULL;
+char *default_landing_page = NULL;
+int num_redir = 0;
 extern pthread_mutex_t SessionListMutex;
 extern pthread_key_t MyConKey;
 
-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 void *housekeeping_loop(void);
+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);
+extern void webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdir, char *relhome);
+extern void worker_entry(void);
 extern void drop_root(uid_t UID);
 
-char ctdl_key_dir[PATH_MAX]=SSL_DIR;
-char file_crpt_file_key[PATH_MAX]="";
-char file_crpt_file_csr[PATH_MAX]="";
-char file_crpt_file_cer[PATH_MAX]="";
-
-char socket_dir[PATH_MAX];			/* where to talk to our citadel server */
-const char editor_absolut_dir[PATH_MAX]=EDITORDIR;	/* nailed to what configure gives us. */
-char static_dir[PATH_MAX];		/* calculated on startup */
-char static_local_dir[PATH_MAX];		/* calculated on startup */
-char static_icon_dir[PATH_MAX];          /* where should we find our mime icons? */
-char  *static_dirs[]={				/* needs same sort order as the web mapping */
-	(char*)static_dir,			/* our templates on disk */
-	(char*)static_local_dir,		/* user provided templates disk */
-	(char*)editor_absolut_dir,		/* the editor on disk */
-	(char*)static_icon_dir                  /* our icons... */
-};
-
-/*
- * Subdirectories from which the client may request static content
- *
- * (If you add more, remember to increment 'ndirs' below)
- */
-char *static_content_dirs[] = {
-	"static",                     /* static templates */
-	"static.local",               /* site local static templates */
-	"tiny_mce"                    /* rich text editor */
-};
-
-int ndirs=3;
-
-
+char socket_dir[PATH_MAX];	/* where to talk to our citadel server */
 char *server_cookie = NULL;	/* our Cookie connection to the client */
 int http_port = PORT_NUM;	/* Port to listen on */
-char *ctdlhost = DEFAULT_HOST;	/* our name */
-char *ctdlport = DEFAULT_PORT;	/* our Port */
-int setup_wizard = 0;		/* should we run the setup wizard? \todo */
-char wizard_filename[PATH_MAX];	/* where's the setup wizard? */
+char *ctdlhost = DEFAULT_HOST;	/* Host name or IP address of Citadel server */
+char *ctdlport = DEFAULT_PORT;	/* Port number of Citadel server */
+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;
+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_backtrace_template_errors;
+extern int DumpTemplateI18NStrings;
+extern StrBuf *I18nDump;
+void InitTemplateCache(void);
+extern int LoadTemplates;
 
-/*
- * Shut us down the regular way.
- * signum is the signal we want to forward
- */
-pid_t current_child;
-void graceful_shutdown_watcher(int signum) {
-	lprintf (1, "bye; shutting down watcher.");
-	kill(current_child, signum);
-	if (signum != SIGHUP)
-		exit(0);
-}
 
 
 
 
 /*
- * Shut us down the regular way.
- * signum is the signal we want to forward
+ * Handle redirects to legacy web servers
  */
-pid_t current_child;
-void graceful_shutdown(int signum) {
-	FILE *FD;
-	int fd;
-
-	lprintf (1, "WebCit is being shut down on signal %d.\n", signum);
-	fd = msock;
-	msock = -1;
-	time_to_die = 1;
-	FD=fdopen(fd, "a+");
-	fflush (FD);
-	fclose (FD);
-	close(fd);
+void handle_redir(void) {
+	if (num_redir > 0) {
+		int i;
+		const char *req = ChrPtr(WC->Hdr->this_page);
+		if (!req) {
+			do_404();
+			return;
+		}
+		if (req[0] == '/') ++req;
+		syslog(9, "handle_redir() called; redirect this: %s", req);
+		for (i=0; i<num_redir; ++i) {
+			if (!strncmp(redir[i].urlpart, req, strlen(redir[i].urlpart))) {
+				char go_here[1024];
+				snprintf(go_here, sizeof go_here, redir[i].redirect_to, req);
+				syslog(9, "redirecting to: %s", go_here);
+				http_redirect(go_here);
+				return;
+			}
+		}
+	}
+	do_404();
 }
 
 
+
 /*
- * Start running as a daemon.
+ * load redirect strings (for supporting transition of legacy web servers to citadel on the same host)
  */
-void start_daemon(char *pid_file) 
-{
-	int status = 0;
-	pid_t child = 0;
-	FILE *fp;
-	int do_restart = 0;
-	int rv;
-	FILE *rvfp = NULL;
-
-	current_child = 0;
-
-	/* Close stdin/stdout/stderr and replace them with /dev/null.
-	 * We don't just call close() because we don't want these fd's
-	 * to be reused for other files.
-	 */
-	rv = chdir("/");
-
-	signal(SIGHUP, SIG_IGN);
-	signal(SIGINT, SIG_IGN);
-	signal(SIGQUIT, SIG_IGN);
-
-	child = fork();
-	if (child != 0) {
-		exit(0);
+void load_redirs(char *filename) {
+	char buf[1024];
+	int num_redir_alloc = num_redir;
+	FILE *fp = fopen(filename, "r");
+	if (!fp) {
+		syslog(1, "Cannot open %s: %s", filename, strerror(errno));
+		return;
 	}
 
-	setsid();
-	umask(0);
-	rvfp = freopen("/dev/null", "r", stdin);
-	rvfp = freopen("/dev/null", "w", stdout);
-	rvfp = freopen("/dev/null", "w", stderr);
-	signal(SIGTERM, graceful_shutdown_watcher);
-	signal(SIGHUP, graceful_shutdown_watcher);
+	while (fgets(buf, sizeof buf, fp) != NULL) {
+		char *ch;
 
-	do {
-		current_child = fork();
+		buf[strlen(buf)-1] = 0;
 
-	
-		if (current_child < 0) {
-			perror("fork");
-			ShutDownLibCitadel ();
-			exit(errno);
-		}
-	
-		else if (current_child == 0) {	/* child process */
-			signal(SIGHUP, graceful_shutdown);
+		ch = strchr(buf, '#');
+		if (ch) strcpy(ch, "");
+		striplt(buf);
+		if (!IsEmptyStr(buf)) {
 
-			return; /* continue starting webcit. */
-		}
-		else { /* watcher process */
-			if (pid_file) {
-				fp = fopen(pid_file, "w");
-				if (fp != NULL) {
-					fprintf(fp, "%d\n", getpid());
-					fclose(fp);
+			if (num_redir >= num_redir_alloc) {
+				if (num_redir_alloc == 0) {
+					num_redir_alloc = 10;
 				}
+				else {
+					num_redir_alloc = num_redir_alloc * 2;
+				}
+				redir = realloc(redir, sizeof(struct redirector) * num_redir_alloc );
 			}
-			waitpid(current_child, &status, 0);
-		}
-
-		do_restart = 0;
-
-		/* Did the main process exit with an actual exit code? */
-		if (WIFEXITED(status)) {
-
-			/* Exit code 0 means the watcher should exit */
-			if (WEXITSTATUS(status) == 0) {
-				do_restart = 0;
-			}
-
-			/* Exit code 101-109 means the watcher should exit */
-			else if ( (WEXITSTATUS(status) >= 101) && (WEXITSTATUS(status) <= 109) ) {
-				do_restart = 0;
-			}
-
-			/* Any other exit code means we should restart. */
-			else {
-				do_restart = 1;
+	
+			extract_token(redir[num_redir].urlpart, buf, 0, '|', sizeof(redir[num_redir].urlpart));
+			extract_token(redir[num_redir].redirect_to, buf, 1, '|', sizeof(redir[num_redir].redirect_to));
+			WebcitAddUrlHandler(redir[num_redir].urlpart, strlen(redir[num_redir].urlpart), "", 0, handle_redir, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
+			if (!strcasecmp(redir[num_redir].urlpart, "home")) {
+				default_landing_page = redir[num_redir].redirect_to ;
 			}
+			++num_redir;
 		}
 
-		/* Any other type of termination (signals, etc.) should also restart. */
-		else {
-			do_restart = 1;
-		}
-
-	} while (do_restart);
-
-	if (pid_file) {
-		unlink(pid_file);
 	}
-	ShutDownLibCitadel ();
-	exit(WEXITSTATUS(status));
+	fclose(fp);
 }
 
-/*
- * Spawn an additional worker thread into the pool.
- */
-void spawn_another_worker_thread()
-{
-	pthread_t SessThread;	/* Thread descriptor */
-	pthread_attr_t attr;	/* Thread attributes */
-	int ret;
-
-	lprintf(3, "Creating a new thread.  Pool size is now %d\n", ++num_threads);
-
-	/* set attributes for the new thread */
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-
-	/*
-	 * Our per-thread stacks need to be bigger than the default size,
-	 * otherwise the MIME parser crashes on FreeBSD.
-	 */
-	if ((ret = pthread_attr_setstacksize(&attr, 1024 * 1024))) {
-		lprintf(1, "pthread_attr_setstacksize: %s\n",
-			strerror(ret));
-		pthread_attr_destroy(&attr);
-	}
 
-	/* now create the thread */
-	if (pthread_create(&SessThread, &attr,
-			   (void *(*)(void *)) worker_entry, NULL)
-	    != 0) {
-		lprintf(1, "Can't create thread: %s\n", strerror(errno));
-	}
-
-	/* free up the attributes */
-	pthread_attr_destroy(&attr);
-}
 
-/* #define DBG_PRINNT_HOOKS_AT_START */
-#ifdef DBG_PRINNT_HOOKS_AT_START
-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 DumpTemplateI18NStrings;
-extern StrBuf *I18nDump;
-void InitTemplateCache(void);
-extern int LoadTemplates;
-
-extern HashList *HandlerHash;
-
-
-
-void
-webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdir, char *relhome)
-{
-	char dirbuffer[PATH_MAX]="";
-	/* calculate all our path on a central place */
-    /* where to keep our config */
-	
-#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
-	snprintf(SUBDIR,sizeof SUBDIR,  "%s%s%s%s%s%s%s", \
-			 (home&!relh)?webcitdir:basedir, \
-             ((basedir!=webcitdir)&(home&!relh))?basedir:"/", \
-             ((basedir!=webcitdir)&(home&!relh))?"/":"", \
-			 relhome, \
-             (relhome[0]!='\0')?"/":"",\
-			 dirbuffer,\
-			 (dirbuffer[0]!='\0')?"/":"");
-	basedir=RUNDIR;
-	COMPUTE_DIRECTORY(socket_dir);
-	basedir=WWWDIR "/static";
-	COMPUTE_DIRECTORY(static_dir);
-	basedir=WWWDIR "/static/icons";
-	COMPUTE_DIRECTORY(static_icon_dir);
-	basedir=WWWDIR "/static.local";
-	COMPUTE_DIRECTORY(static_local_dir);
-	StripSlashes(static_dir, 1);
-	StripSlashes(static_icon_dir, 1);
-	StripSlashes(static_local_dir, 1);
-
-	snprintf(file_crpt_file_key,
-		 sizeof file_crpt_file_key, 
-		 "%s/citadel.key",
-		 ctdl_key_dir);
-	snprintf(file_crpt_file_csr,
-		 sizeof file_crpt_file_csr, 
-		 "%s/citadel.csr",
-		 ctdl_key_dir);
-	snprintf(file_crpt_file_cer,
-		 sizeof file_crpt_file_cer, 
-		 "%s/citadel.cer",
-		 ctdl_key_dir);
-
-	/* we should go somewhere we can leave our coredump, if enabled... */
-	lprintf(9, "Changing directory to %s\n", socket_dir);
-	if (chdir(webcitdir) != 0) {
-		perror("chdir");
-	}
-}
 /*
  * Here's where it all begins.
  */
@@ -320,12 +150,11 @@ 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;
 	char relhome[PATH_MAX]="";
 	char webcitdir[PATH_MAX] = DATADIR;
 	char *pidfile = NULL;
@@ -357,14 +186,17 @@ int main(int argc, char **argv)
 
 	/* Parse command line */
 #ifdef HAVE_OPENSSL
-	while ((a = getopt(argc, argv, "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:r:cfsS:Z")) != EOF)
 #else
-	while ((a = getopt(argc, argv, "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:r:cfZ")) != EOF)
 #endif
 		switch (a) {
 		case 'u':
 			UID = atol(optarg);
 			break;
+		case 'r':
+			load_redirs(optarg);
+			break;
 		case 'h':
 			hdir = strdup(optarg);
 			relh=hdir[0]!='/';
@@ -375,7 +207,6 @@ int main(int argc, char **argv)
 				safestrncpy(relhome, relhome, sizeof relhome);
 			}
 			/* free(hdir); TODO: SHOULD WE DO THIS? */
-			home_specified = 1;
 			home=1;
 			break;
 		case 'd':
@@ -408,7 +239,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;
@@ -428,8 +259,7 @@ int main(int argc, char **argv)
 				if (gethostname
 				    (&server_cookie[strlen(server_cookie)],
 				     200) != 0) {
-					lprintf(2, "gethostname: %s\n",
-						strerror(errno));
+					syslog(2, "gethostname: %s", strerror(errno));
 					free(server_cookie);
 				}
 			}
@@ -461,6 +291,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)
@@ -472,6 +308,7 @@ int main(int argc, char **argv)
 		start_daemon(pidfile);
 	}
 	else {
+		signal(SIGINT, graceful_shutdown);
 		signal(SIGHUP, graceful_shutdown);
 	}
 
@@ -479,34 +316,42 @@ int main(int argc, char **argv)
 	LoadIconDir(static_icon_dir);
 
 	/* 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 */
+	syslog(1, "%s", PACKAGE_STRING);
+	syslog(1, "Copyright (C) 1996-2011 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");
+	syslog(1, "by the Free Software Foundation, either version 3 of the License, or");
+	syslog(1, "(at your option) any later version.");
+	syslog(1, " ");
+	syslog(1, "This program is distributed in the hope that it will be useful,");
+	syslog(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+	syslog(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the");
+	syslog(1, "GNU General Public License for more details.");
+	syslog(1, " ");
+	syslog(1, "You should have received a copy of the GNU General Public License");
+	syslog(1, "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
+	syslog(1, " ");
+
+
+	/* initialize various subsystems */
 
 	initialise_modules();
-	initialize_viewdefs();
-	initialize_axdefs();
-
 	InitTemplateCache();
 	if (DumpTemplateI18NStrings) {
 		FILE *fd;
 		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, "********************************************************************************\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) {
-			lprintf(1, "********************************************************************************\n");
-			lprintf(1, "*                  unable to open I18N dumpfile [%s]         *\n", I18nDumpFile);
-			lprintf(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);
@@ -527,7 +372,7 @@ int main(int argc, char **argv)
 	 * wcsession struct to which the thread is currently bound.
 	 */
 	if (pthread_key_create(&MyConKey, NULL) != 0) {
-		lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+		syslog(1, "Can't create TSD key: %s\n", strerror(errno));
 	}
 	InitialiseSemaphores ();
 
@@ -539,23 +384,23 @@ int main(int argc, char **argv)
 	 */
 #ifdef HAVE_OPENSSL
 	if (pthread_key_create(&ThreadSSL, NULL) != 0) {
-		lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+		syslog(1, "Can't create TSD key: %s\n", strerror(errno));
 	}
 #endif
 
 	/*
 	 * 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);
+		syslog(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
+		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);
+		syslog(2, "Attempting to bind to port %d...\n", http_port);
+		msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
 	}
 	if (msock < 0)
 	{
@@ -563,7 +408,7 @@ int main(int argc, char **argv)
 		return -msock;
 	}
 
-	lprintf(2, "Listening on socket %d\n", msock);
+	syslog(2, "Listening on socket %d\n", msock);
 	signal(SIGPIPE, SIG_IGN);
 
 	pthread_mutex_init(&SessionListMutex, NULL);
@@ -587,219 +432,14 @@ 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 ();
+	ShutDownLibCitadel();
 	return 0;
 }
 
 
-void ShutDownWebcit(void)
-{
-	free_zone_directory ();
-	icaltimezone_release_zone_tab ();
-	icalmemory_free_ring ();
-	ShutDownLibCitadel ();
-	shutdown_modules ();
-#ifdef HAVE_OPENSSL
-	if (is_https) {
-		shutdown_ssl();
-	}
-#endif
-}
-
-/*
- * Entry point for worker threads
- */
-void worker_entry(void)
-{
-	int ssock;
-	int i = 0;
-	int fail_this_transaction = 0;
-	int ret;
-	struct timeval tv;
-	fd_set readset, tempset;
-	ParsedHttpHdrs Hdr;
-
-	memset(&Hdr, 0, sizeof(ParsedHttpHdrs));
-	Hdr.HR.eReqType = eGET;
-	http_new_modules(&Hdr);	
-	tv.tv_sec = 0;
-	tv.tv_usec = 10000;
-	FD_ZERO(&readset);
-	FD_SET(msock, &readset);
-
-	do {
-		/* Only one thread can accept at a time */
-		fail_this_transaction = 0;
-		ssock = -1; 
-		errno = EAGAIN;
-		do {
-			ret = -1; /* just one at once should select... */
-			begin_critical_section(S_SELECT);
-
-			FD_ZERO(&tempset);
-			if (msock > 0) FD_SET(msock, &tempset);
-			tv.tv_sec = 0;
-			tv.tv_usec = 10000;
-			if (msock > 0)	ret = select(msock+1, &tempset, NULL, NULL,  &tv);
-			end_critical_section(S_SELECT);
-			if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN))
-			{/* EINTR and EAGAIN are thrown but not of interest. */
-				lprintf(2, "accept() failed:%d %s\n",
-					errno, strerror(errno));
-			}
-			else if ((ret > 0) && (msock > 0) && FD_ISSET(msock, &tempset))
-			{/* Successfully selected, and still not shutting down? Accept! */
-				ssock = accept(msock, NULL, 0);
-			}
-			
-		} while ((msock > 0) && (ssock < 0)  && (time_to_die == 0));
-
-		if ((msock == -1)||(time_to_die))
-		{/* ok, we're going down. */
-			int shutdown = 0;
-
-			/* the first to come here will have to do the cleanup.
-			 * make shure its realy just one.
-			 */
-			begin_critical_section(S_SHUTDOWN);
-			if (msock == -1)
-			{
-				msock = -2;
-				shutdown = 1;
-			}
-			end_critical_section(S_SHUTDOWN);
-			if (shutdown == 1)
-			{/* we're the one to cleanup the mess. */
-				http_destroy_modules(&Hdr);
-				lprintf(2, "I'm master shutdown: tagging sessions to be killed.\n");
-				shutdown_sessions();
-				lprintf(2, "master shutdown: waiting for others\n");
-				sleeeeeeeeeep(1); /* wait so some others might finish... */
-				lprintf(2, "master shutdown: cleaning up sessions\n");
-				do_housekeeping();
-				lprintf(2, "master shutdown: cleaning up libical\n");
-
-				ShutDownWebcit();
-
-				lprintf(2, "master shutdown exiting!.\n");				
-				exit(0);
-			}
-			break;
-		}
-		if (ssock < 0 ) continue;
-
-		if (msock < 0) {
-			if (ssock > 0) close (ssock);
-			lprintf(2, "inbetween.");
-			pthread_exit(NULL);
-		} else { /* Got it? do some real work! */
-			/* Set the SO_REUSEADDR socket option */
-			i = 1;
-			setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
-				   &i, sizeof(i));
-
-			/* If we are an HTTPS server, go crypto now. */
-#ifdef HAVE_OPENSSL
-			if (is_https) {
-				if (starttls(ssock) != 0) {
-					fail_this_transaction = 1;
-					close(ssock);
-				}
-			}
-			else 
-#endif
-			{
-				int fdflags; 
-				fdflags = fcntl(ssock, F_GETFL);
-				if (fdflags < 0)
-					lprintf(1, "unable to get server socket flags! %s \n",
-						strerror(errno));
-				fdflags = fdflags | O_NONBLOCK;
-				if (fcntl(ssock, F_SETFL, fdflags) < 0)
-					lprintf(1, "unable to set server socket nonblocking flags! %s \n",
-						strerror(errno));
-			}
-
-			if (fail_this_transaction == 0) {
-				Hdr.http_sock = ssock;
-
-				/* Perform an HTTP transaction... */
-				context_loop(&Hdr);
-
-				/* Shut down SSL/TLS if required... */
-#ifdef HAVE_OPENSSL
-				if (is_https) {
-					endtls();
-				}
-#endif
-
-				/* ...and close the socket. */
-				if (Hdr.http_sock > 0)
-					lingering_close(ssock);
-				http_detach_modules(&Hdr);
-
-			}
-
-		}
-
-	} while (!time_to_die);
-
-	http_destroy_modules(&Hdr);
-	lprintf (1, "bye\n");
-	pthread_exit(NULL);
-}
-
-/*
- * print log messages 
- * logs to stderr if loglevel is lower than the verbosity set at startup
- *
- * loglevel	level of the message
- * format	the printf like format string
- * ...		the strings to put into format
- */
-int lprintf(int loglevel, const char *format, ...)
-{
-	va_list ap;
-
-	if (loglevel <= verbosity) {
-		va_start(ap, format);
-		vfprintf(stderr, format, ap);
-		va_end(ap);
-		fflush(stderr);
-	}
-	return 1;
-}
-
 
-/*
- * print the actual stack frame.
- */
-void wc_backtrace(void)
-{
-#ifdef HAVE_BACKTRACE
-	void *stack_frames[50];
-	size_t size, i;
-	char **strings;
-
-
-	size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
-	strings = backtrace_symbols(stack_frames, size);
-	for (i = 0; i < size; i++) {
-		if (strings != NULL)
-			lprintf(1, "%s\n", strings[i]);
-		else
-			lprintf(1, "%p\n", stack_frames[i]);
-	}
-	free(strings);
-#endif
-}