X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=c3263ecb7820fb1d4e5abbf4197087aa60021aeb;hb=e7923ad2e2db07d95b5d127f12f17d89dd9fe279;hp=a629036e04d7d1a8c3f1de3c91d184d2e9898085;hpb=6a828fe0a0e5c73e66cee93238f94dc3c2191a40;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index a629036e0..c3263ecb7 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,494 +1,118 @@
 /*
  * $Id$
- */
-/**
- * \defgroup Webserver This contains a simple multithreaded TCP server manager.  It sits around
+ *
+ * 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.
- * \ingroup WebcitHttpServer
+ *
+ * Copyright (c) 1996-2009 by the citadel.org developers.
+ * This program is released under the terms of the GNU General Public License v3.
+ *
  */
 
-/*@{*/
 #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 */
-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;            /**< shold we shut down? */
-extern void *context_loop(int);
+int verbosity = 9;		/* Logging level */
+int msock;			/* master listening socket */
+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);
 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);
+
 
 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 */
-static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /**< nailed to what configure gives us. */
-static char static_dir[PATH_MAX]; /**< calculated on startup */
-static char static_local_dir[PATH_MAX]; /**< calculated on startup */
-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 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"                    /** the JS editor */
+	"static",                     /* static templates */
+	"static.local",               /* site local static templates */
+	"tiny_mce"                    /* rich text editor */
 };
 
 int ndirs=3;
 
 
-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? */
-int running_as_daemon = 0;     /**< should we deamonize on startup? */
-
-
-/** 
- * \brief This is a generic function to set up a master socket for listening on
- * a TCP port.  The server shuts down if the bind fails.
- * \param ip_addr ip to bind to
- * \param port_number the port to bind to 
- * \param queue_len the size of the input queue ????
- */
-int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
-{
-	struct sockaddr_in sin;
-	int s, i;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	if (ip_addr == NULL) {
-		sin.sin_addr.s_addr = INADDR_ANY;
-	} else {
-		sin.sin_addr.s_addr = inet_addr(ip_addr);
-	}
-
-	if (sin.sin_addr.s_addr == INADDR_NONE) {
-		sin.sin_addr.s_addr = INADDR_ANY;
-	}
-
-	if (port_number == 0) {
-		lprintf(1, "Cannot start: no port number specified.\n");
-		exit(WC_EXIT_BIND);
-	}
-	sin.sin_port = htons((u_short) port_number);
-
-	s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
-	if (s < 0) {
-		lprintf(1, "Can't create a socket: %s\n", strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-	/** Set some socket options that make sense. */
-	i = 1;
-	setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
-
-	if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-		lprintf(1, "Can't bind: %s\n", strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-	if (listen(s, queue_len) < 0) {
-		lprintf(1, "Can't listen: %s\n", strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-	return (s);
-}
-
-
-
-/**
- * \brief Create a Unix domain socket and listen on it
- * \param sockpath file name of the unix domain socket
- * \param queue_len queue size of the kernel fifo????
- */
-int ig_uds_server(char *sockpath, int queue_len)
-{
-	struct sockaddr_un addr;
-	int s;
-	int i;
-	int actual_queue_len;
-
-	actual_queue_len = queue_len;
-	if (actual_queue_len < 5) actual_queue_len = 5;
-
-	i = unlink(sockpath);
-	if (i != 0) if (errno != ENOENT) {
-		lprintf(1, "citserver: can't unlink %s: %s\n",
-			sockpath, strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-
-	memset(&addr, 0, sizeof(addr));
-	addr.sun_family = AF_UNIX;
-	safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
-
-	s = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (s < 0) {
-		lprintf(1, "citserver: Can't create a socket: %s\n",
-			strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-
-	if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-		lprintf(1, "citserver: Can't bind: %s\n",
-			strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-
-	if (listen(s, actual_queue_len) < 0) {
-		lprintf(1, "citserver: Can't listen: %s\n",
-			strerror(errno));
-		exit(WC_EXIT_BIND);
-	}
-
-	chmod(sockpath, 0777);
-	return(s);
-}
-
-
-
-
-/**
- * \brief Read data from the client socket.
- * \param sock socket fd to read from ???
- * \param buf buffer to read into 
- * \param bytes how large is the read buffer?
- * \param timeout how long should we wait for input?
- * \return values are\
- *      1       Requested number of bytes has been read.\
- *      0       Request timed out.\
- *	   -1   	Connection is broken, or other error.
- */
-int client_read_to(int sock, char *buf, int bytes, int timeout)
-{
-	int len, rlen;
-	fd_set rfds;
-	struct timeval tv;
-	int retval;
-
-
-#ifdef HAVE_OPENSSL
-	if (is_https) {
-		return (client_read_ssl(buf, bytes, timeout));
-	}
-#endif
-
-	len = 0;
-	while (len < bytes) {
-		FD_ZERO(&rfds);
-		FD_SET(sock, &rfds);
-		tv.tv_sec = timeout;
-		tv.tv_usec = 0;
-
-		retval = select((sock) + 1, &rfds, NULL, NULL, &tv);
-		if (FD_ISSET(sock, &rfds) == 0) {
-			return (0);
-		}
-
-		rlen = read(sock, &buf[len], bytes - len);
-
-		if (rlen < 1) {
-			lprintf(2, "client_read() failed: %s\n",
-				strerror(errno));
-			return (-1);
-		}
-		len = len + rlen;
-	}
-
-#ifdef HTTP_TRACING
-	write(2, "\033[32m", 5);
-	write(2, buf, bytes);
-	write(2, "\033[30m", 5);
-#endif
-	return (1);
-}
-
-/**
- * \brief write data to the client
- * \param buf data to write to the client
- * \param count size of buffer
- */
-ssize_t client_write(const void *buf, size_t count)
-{
-	char *newptr;
-	size_t newalloc;
-
-	if (WC->burst != NULL) {
-		if ((WC->burst_len + count) >= WC->burst_alloc) {
-			newalloc = (WC->burst_alloc * 2);
-			if ((WC->burst_len + count) >= newalloc) {
-				newalloc += count;
-			}
-			newptr = realloc(WC->burst, newalloc);
-			if (newptr != NULL) {
-				WC->burst = newptr;
-				WC->burst_alloc = newalloc;
-			}
-		}
-		if ((WC->burst_len + count) < WC->burst_alloc) {
-			memcpy(&WC->burst[WC->burst_len], buf, count);
-			WC->burst_len += count;
-			return (count);
-		}
-		else {
-			return(-1);
-		}
-	}
-#ifdef HAVE_OPENSSL
-	if (is_https) {
-		client_write_ssl((char *) buf, count);
-		return (count);
-	}
-#endif
-#ifdef HTTP_TRACING
-	write(2, "\033[34m", 5);
-	write(2, buf, count);
-	write(2, "\033[30m", 5);
-#endif
-	return (write(WC->http_sock, buf, count));
-}
-
-/**
- * \brief what burst???
- */
-void begin_burst(void)
-{
-	if (WC->burst != NULL) {
-		free(WC->burst);
-		WC->burst = NULL;
-	}
-	WC->burst_len = 0;
-	WC->burst_alloc = 32768;
-	WC->burst = malloc(WC->burst_alloc);
-}
-
-
-/**
- * \brief uses the same calling syntax as compress2(), but it
- * creates a stream compatible with HTTP "Content-encoding: gzip"
- */
-#ifdef HAVE_ZLIB
-#define DEF_MEM_LEVEL 8 /**< memlevel??? */
-#define OS_CODE 0x03	/**< unix */
-int ZEXPORT compress_gzip(Bytef * dest,         /**< compressed buffer*/
-						  uLongf * destLen,     /**< length of the compresed data */
-						  const Bytef * source, /**< source to encode */
-						  uLong sourceLen,      /**< length of the source to encode */
-						  int level)            /**< what level??? */
-{
-	const int gz_magic[2] = { 0x1f, 0x8b };	/** gzip magic header */
-
-	/** write gzip header */
-	sprintf((char *) dest, "%c%c%c%c%c%c%c%c%c%c",
-		gz_magic[0], gz_magic[1], Z_DEFLATED,
-		0 /*flags */ , 0, 0, 0, 0 /*time */ , 0 /** xflags */ ,
-		OS_CODE);
-
-	/* normal deflate */
-	z_stream stream;
-	int err;
-	stream.next_in = (Bytef *) source;
-	stream.avail_in = (uInt) sourceLen;
-	stream.next_out = dest + 10L;	// after header
-	stream.avail_out = (uInt) * destLen;
-	if ((uLong) stream.avail_out != *destLen)
-		return Z_BUF_ERROR;
-
-	stream.zalloc = (alloc_func) 0;
-	stream.zfree = (free_func) 0;
-	stream.opaque = (voidpf) 0;
-
-	err = deflateInit2(&stream, level, Z_DEFLATED, -MAX_WBITS,
-			   DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY);
-	if (err != Z_OK)
-		return err;
-
-	err = deflate(&stream, Z_FINISH);
-	if (err != Z_STREAM_END) {
-		deflateEnd(&stream);
-		return err == Z_OK ? Z_BUF_ERROR : err;
-	}
-	*destLen = stream.total_out + 10L;
-
-	/* write CRC and Length */
-	uLong crc = crc32(0L, source, sourceLen);
-	int n;
-	for (n = 0; n < 4; ++n, ++*destLen) {
-		dest[*destLen] = (int) (crc & 0xff);
-		crc >>= 8;
-	}
-	uLong len = stream.total_in;
-	for (n = 0; n < 4; ++n, ++*destLen) {
-		dest[*destLen] = (int) (len & 0xff);
-		len >>= 8;
-	}
-	err = deflateEnd(&stream);
-	return err;
-}
-#endif
-
-/**
- * \brief what burst???
- */
-void end_burst(void)
-{
-	size_t the_len;
-	char *the_data;
-
-	if (WC->burst == NULL)
-		return;
-
-	the_len = WC->burst_len;
-	the_data = WC->burst;
-
-	WC->burst_len = 0;
-	WC->burst_alloc = 0;
-	WC->burst = NULL;
-
-#ifdef HAVE_ZLIB
-	/* Handle gzip compression */
-	if (WC->gzip_ok) {
-		char *compressed_data = NULL;
-		uLongf compressed_len;
-
-		compressed_len = (uLongf) ((the_len * 101) / 100) + 100;
-		compressed_data = malloc(compressed_len);
-
-		if (compress_gzip((Bytef *) compressed_data,
-				  &compressed_len,
-				  (Bytef *) the_data,
-				  (uLongf) the_len, Z_BEST_SPEED) == Z_OK) {
-			wprintf("Content-encoding: gzip\r\n");
-			free(the_data);
-			the_data = compressed_data;
-			the_len = compressed_len;
-		} else {
-			free(compressed_data);
-		}
-	}
-#endif				/* HAVE_ZLIB */
-
-	wprintf("Content-length: %d\r\n\r\n", the_len);
-	client_write(the_data, the_len);
-	free(the_data);
-	return;
-}
-
-
+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? */
+int running_as_daemon = 0;	/* should we deamonize on startup? */
 
-/**
- * \brief Read data from the client socket with default timeout.
- * (This is implemented in terms of client_read_to() and could be
- * justifiably moved out of sysdep.c)
- * \param sock the socket fd to read from???
- * \param buf the buffer to write to
- * \param bytes how large is the buffer
- */
-int client_read(int sock, char *buf, int bytes)
-{
-	return (client_read_to(sock, buf, bytes, SLEEPING));
-}
-
-
-/**
- * \brief Get a LF-terminated line of text from the client.
- * (This is implemented in terms of client_read() and could be
- * justifiably moved out of sysdep.c)
- * \param sock socket fd to get client line from???
- * \param buf buffer to write read data to
- * \param bufsiz how many bytes to read
- * \return  numer of bytes read???
- */
-int client_getln(int sock, char *buf, int bufsiz)
-{
-	int i, retval;
 
-	/** Read one character at a time.*/
-	for (i = 0;; i++) {
-		retval = client_read(sock, &buf[i], 1);
-		if (retval != 1 || buf[i] == '\n' || i == (bufsiz-1))
-			break;
-		if ( (!isspace(buf[i])) && (!isprint(buf[i])) ) {
-			/** Non printable character recieved from client */
-			return(-1);
-		}
-	}
-
-	/** If we got a long line, discard characters until the newline. */
-	if (i == (bufsiz-1))
-		while (buf[i] != '\n' && retval == 1)
-			retval = client_read(sock, &buf[i], 1);
-
-	/**
-	 * Strip any trailing non-printable characters.
-	 */
-	buf[i] = 0;
-	while ((i > 0) && (!isprint(buf[i - 1]))) {
-		buf[--i] = 0;
-	}
-	return (retval);
-}
 
-/**
- * \brief shut us down the regular way.
- * param signum the signal we want to forward
+/*
+ * 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);
-	exit(0);
+	if (signum != SIGHUP)
+		exit(0);
 }
 
-/**
- * \brief shut us down the regular way.
- * param signum the signal we want to forward
+
+
+
+/*
+ * Shut us down the regular way.
+ * signum is the signal we want to forward
  */
 pid_t current_child;
 void graceful_shutdown(int signum) {
-//	kill(current_child, signum);
-	char wd[SIZ];
-	getcwd(wd, SIZ);
-	lprintf (1, "bye going down gracefull.[%s]\n", wd);
+	FILE *FD;
+	int fd;
+
+	lprintf (1, "WebCit is being shut down on signal %d.\n", signum);
+	fd = msock;
+	msock = -1;
 	time_to_die = 1;
-	exit(0);
+	FD=fdopen(fd, "a+");
+	fflush (FD);
+	fclose (FD);
+	close(fd);
 }
 
 
-/**
- * \brief	Start running as a daemon.  
- *
- * param	do_close_stdio		Only close stdio if set.
- */
-
 /*
  * Start running as a daemon.
  */
@@ -498,6 +122,8 @@ void start_daemon(char *pid_file)
 	pid_t child = 0;
 	FILE *fp;
 	int do_restart = 0;
+	int rv;
+	FILE *rvfp = NULL;
 
 	current_child = 0;
 
@@ -505,7 +131,7 @@ void start_daemon(char *pid_file)
 	 * We don't just call close() because we don't want these fd's
 	 * to be reused for other files.
 	 */
-	chdir("/");
+	rv = chdir("/");
 
 	signal(SIGHUP, SIG_IGN);
 	signal(SIGINT, SIG_IGN);
@@ -518,10 +144,11 @@ void start_daemon(char *pid_file)
 
 	setsid();
 	umask(0);
-	freopen("/dev/null", "r", stdin);
-	freopen("/dev/null", "w", stdout);
-	freopen("/dev/null", "w", stderr);
+	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);
 
 	do {
 		current_child = fork();
@@ -529,20 +156,20 @@ void start_daemon(char *pid_file)
 	
 		if (current_child < 0) {
 			perror("fork");
+			ShutDownLibCitadel ();
 			exit(errno);
 		}
 	
-		else if (current_child == 0) {
-			signal(SIGTERM, graceful_shutdown);
+		else if (current_child == 0) {	/* child process */
+			signal(SIGHUP, graceful_shutdown);
+
 			return; /* continue starting webcit. */
 		}
-	
-		else {
-			signal(SIGTERM, SIG_IGN);
+		else { /* watcher process */
 			if (pid_file) {
 				fp = fopen(pid_file, "w");
 				if (fp != NULL) {
-					fprintf(fp, "%d\n", current_child);
+					fprintf(fp, "%d\n", getpid());
 					fclose(fp);
 				}
 			}
@@ -580,28 +207,28 @@ void start_daemon(char *pid_file)
 	if (pid_file) {
 		unlink(pid_file);
 	}
+	ShutDownLibCitadel ();
 	exit(WEXITSTATUS(status));
 }
 
-/**
- * \brief	Spawn an additional worker thread into the pool.
+/*
+ * Spawn an additional worker thread into the pool.
  */
 void spawn_another_worker_thread()
 {
-	pthread_t SessThread;	/**< Thread descriptor */
-	pthread_attr_t attr;	/**< Thread attributes */
+	pthread_t SessThread;	/* Thread descriptor */
+	pthread_attr_t attr;	/* Thread attributes */
 	int ret;
 
-	lprintf(3, "Creating a new thread\n");
+	lprintf(3, "Creating a new thread.  Pool size is now %d\n", ++num_threads);
 
-	/** set attributes for the new thread */
+	/* 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, and the IMAP service crashes on
-	 * 64-bit Linux.
+	/*
+	 * 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",
@@ -609,30 +236,91 @@ void spawn_another_worker_thread()
 		pthread_attr_destroy(&attr);
 	}
 
-	/** now create the thread */
+	/* 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 */
+	/* free up the attributes */
 	pthread_attr_destroy(&attr);
 }
 
-/**
- * \brief Here's where it all begins.
- * \param argc number of commandline args
- * \param argv the commandline arguments
+/* #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.
  */
 int main(int argc, char **argv)
 {
-	pthread_t SessThread;	/**< Thread descriptor */
-	pthread_attr_t attr;	/**< Thread attributes */
-	int a, i;	        	/**< General-purpose variables */
+	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 */
 	char tracefile[PATH_MAX];
 	char ip_addr[256]="0.0.0.0";
-	char dirbuffer[PATH_MAX]="";
 	int relh=0;
 	int home=0;
 	int home_specified=0;
@@ -640,30 +328,47 @@ int main(int argc, char **argv)
 	char webcitdir[PATH_MAX] = DATADIR;
 	char *pidfile = NULL;
 	char *hdir;
-	const char *basedir;
-#ifdef ENABLE_NLS
-	char *locale = NULL;
-	char *mo = NULL;
-#endif /* ENABLE_NLS */
-	char uds_listen_path[PATH_MAX];	/**< listen on a unix domain socket? */
+	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 ();
+
+#ifdef DBG_PRINNT_HOOKS_AT_START
+/*	dbg_PrintHash(HandlerHash, nix, NULL);*/
+#endif
+
+	/* Ensure that we are linked to the correct version of libcitadel */
+	if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
+		fprintf(stderr, " You are running libcitadel version %d.%02d\n",
+			(libcitadel_version_number() / 100), (libcitadel_version_number() % 100));
+		fprintf(stderr, "WebCit was compiled against version %d.%02d\n",
+			(LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100));
+		return(1);
+	}
 
 	strcpy(uds_listen_path, "");
 
-	/** Parse command line */
+	/* Parse command line */
 #ifdef HAVE_OPENSSL
-	while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cfs")) != EOF)
+	while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
 #else
-	while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cf")) != EOF)
+	while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
 #endif
 		switch (a) {
 		case 'h':
 			hdir = strdup(optarg);
 			relh=hdir[0]!='/';
-			if (!relh) safestrncpy(webcitdir, hdir,
-								   sizeof webcitdir);
-			else
-				safestrncpy(relhome, relhome,
-							sizeof relhome);
+			if (!relh) {
+				safestrncpy(webcitdir, hdir, sizeof webcitdir);
+			}
+			else {
+				safestrncpy(relhome, relhome, sizeof relhome);
+			}
 			/* free(hdir); TODO: SHOULD WE DO THIS? */
 			home_specified = 1;
 			home=1;
@@ -675,6 +380,11 @@ int main(int argc, char **argv)
 			pidfile = strdup(optarg);
 			running_as_daemon = 1;
 			break;
+		case 'B': /* Basesize */
+			basesize = atoi(optarg);
+			if (basesize > 2)
+				StartLibCitadel(basesize);
+			break;
 		case 'i':
 			safestrncpy(ip_addr, optarg, sizeof ip_addr);
 			break;
@@ -686,9 +396,17 @@ int main(int argc, char **argv)
 			break;
 		case 't':
 			safestrncpy(tracefile, optarg, sizeof tracefile);
-			freopen(tracefile, "w", stdout);
-			freopen(tracefile, "w", stderr);
-			freopen(tracefile, "r", stdin);
+			rvfp = freopen(tracefile, "w", stdout);
+			rvfp = freopen(tracefile, "w", stderr);
+			rvfp = freopen(tracefile, "r", stdin);
+			break;
+		case 'T':
+			LoadTemplates = atoi(optarg);
+			dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
+			dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+			break;
+		case 'Z':
+			DisableGzip = 1;
 			break;
 		case 'x':
 			verbosity = atoi(optarg);
@@ -711,16 +429,28 @@ int main(int argc, char **argv)
 				}
 			}
 			break;
+#ifdef HAVE_OPENSSL
 		case 's':
 			is_https = 1;
 			break;
+		case 'S':
+			is_https = 1;
+			ssl_cipher_list = strdup(optarg);
+			break;
+#endif
+		case 'G':
+			DumpTemplateI18NStrings = 1;
+			I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
+			I18nDumpFile = optarg;
+			break;
 		default:
-			fprintf(stderr, "usage: webserver "
+			fprintf(stderr, "usage: webcit "
 				"[-i ip_addr] [-p http_port] "
 				"[-t tracefile] [-c] [-f] "
-				"[-d] "
+				"[-T Templatedebuglevel] "
+				"[-d] [-Z] [-G i18ndumpfile] "
 #ifdef HAVE_OPENSSL
-				"[-s] "
+				"[-s] [-S cipher_suites]"
 #endif
 				"[remotehost [remoteport]]\n");
 			return 1;
@@ -733,74 +463,60 @@ int main(int argc, char **argv)
 	}
 
 	/* daemonize, if we were asked to */
-	if (running_as_daemon) {
+	if (!DumpTemplateI18NStrings && running_as_daemon) {
 		start_daemon(pidfile);
 	}
 	else {
-		signal(SIGTERM, graceful_shutdown);
+		signal(SIGHUP, graceful_shutdown);
 	}
 
-	/** Tell 'em who's in da house */
-	lprintf(1, SERVER "\n");
-	lprintf(1, "Copyright (C) 1996-2007 by the Citadel development team.\n"
+	webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome);
+	LoadIconDir(static_icon_dir);
+
+	/* Tell 'em who's in da house */
+	lprintf(1, PACKAGE_STRING "\n");
+	lprintf(1, "Copyright (C) 1996-2009 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 */
-#ifdef ENABLE_NLS
-	initialize_locales();
-	locale = setlocale(LC_ALL, "");
-	mo = malloc(strlen(webcitdir) + 20);
-	lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale"));
-	free(mo);
-	lprintf(9, "Text domain: %s\n", textdomain("webcit"));
-	lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8"));
-#endif
+	/* initialize the International Bright Young Thing */
 
+	initialise_modules();
+	initialize_viewdefs();
+	initialize_axdefs();
 
-	/* 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.local";
-	COMPUTE_DIRECTORY(static_local_dir);
+	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");
+			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");
+			return -1;
+		}
+		rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
+		fclose(fd);
+		return 0;
+	}
 
-	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");
-	}
-	initialize_viewdefs();
-	initialize_axdefs();
+	/* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
+	icalerror_errors_are_fatal = 0;
+
+	/* Use our own prefix on tzid's generated from system tzdata */
+	icaltimezone_set_tzid_prefix("/citadel.org/");
 
-	/**
+	/*
 	 * Set up a place to put thread-specific data.
 	 * We only need a single pointer per thread - it points to the
 	 * wcsession struct to which the thread is currently bound.
@@ -808,8 +524,9 @@ int main(int argc, char **argv)
 	if (pthread_key_create(&MyConKey, NULL) != 0) {
 		lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
 	}
+	InitialiseSemaphores ();
 
-	/**
+	/*
 	 * Set up a place to put thread-specific SSL data.
 	 * We don't stick this in the wcsession struct because SSL starts
 	 * up before the session is bound, and it gets torn down between
@@ -821,7 +538,7 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	/**
+	/*
 	 * Bind the server to our favorite port.
 	 * There is no need to check for errors, because ig_tcp_server()
 	 * exits if it doesn't succeed.
@@ -835,13 +552,18 @@ int main(int argc, char **argv)
 		lprintf(2, "Attempting to bind to port %d...\n", http_port);
 		msock = ig_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
 	}
+	if (msock < 0)
+	{
+		ShutDownWebcit();
+		return -msock;
+	}
 
 	lprintf(2, "Listening on socket %d\n", msock);
 	signal(SIGPIPE, SIG_IGN);
 
 	pthread_mutex_init(&SessionListMutex, NULL);
 
-	/**
+	/*
 	 * Start up the housekeeping thread
 	 */
 	pthread_attr_init(&attr);
@@ -850,7 +572,7 @@ int main(int argc, char **argv)
 		       (void *(*)(void *)) housekeeping_loop, NULL);
 
 
-	/**
+	/*
 	 * If this is an HTTPS server, fire up SSL
 	 */
 #ifdef HAVE_OPENSSL
@@ -859,18 +581,33 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	/** Start a few initial worker threads */
+	/* 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 */
 	worker_entry();
+	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)
@@ -878,21 +615,91 @@ 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 */
+		/* Only one thread can accept at a time */
 		fail_this_transaction = 0;
-		ssock = accept(msock, NULL, 0);
-		if (ssock < 0) {
-			lprintf(2, "accept() failed: %s\n",
-				strerror(errno));
-		} else {
-			/** Set the SO_REUSEADDR socket option */
+		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. */
+			/* If we are an HTTPS server, go crypto now. */
 #ifdef HAVE_OPENSSL
 			if (is_https) {
 				if (starttls(ssock) != 0) {
@@ -900,38 +707,56 @@ void worker_entry(void)
 					close(ssock);
 				}
 			}
+			else 
+			{
+				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_SETFD, fdflags) < 0)
+					lprintf(1, "unable to set server socket nonblocking flags! %s \n",
+						strerror(errno));
+			}
 #endif
 
 			if (fail_this_transaction == 0) {
+				Hdr.http_sock = ssock;
 
-				/** Perform an HTTP transaction... */
-				context_loop(ssock);
+				/* Perform an HTTP transaction... */
+				context_loop(&Hdr);
 
-				/** Shut down SSL/TLS if required... */
+				/* Shut down SSL/TLS if required... */
 #ifdef HAVE_OPENSSL
 				if (is_https) {
 					endtls();
 				}
 #endif
 
-				/** ...and close the socket. */
-				lingering_close(ssock);
+				/* ...and close the socket. */
+				if (Hdr.http_sock > 0)
+					lingering_close(ssock);
+				http_detach_modules(&Hdr);
+
 			}
 
 		}
 
 	} while (!time_to_die);
 
-	lprintf (1, "bye");
+	http_destroy_modules(&Hdr);
+	lprintf (1, "bye\n");
 	pthread_exit(NULL);
 }
 
-/**
- * \brief logprintf. log messages 
+/*
+ * print log messages 
  * logs to stderr if loglevel is lower than the verbosity set at startup
- * \param loglevel level of the message
- * \param format the printf like format string
- * \param ... the strings to put into format
+ *
+ * loglevel	level of the message
+ * format	the printf like format string
+ * ...		the strings to put into format
  */
 int lprintf(int loglevel, const char *format, ...)
 {
@@ -947,8 +772,8 @@ int lprintf(int loglevel, const char *format, ...)
 }
 
 
-/**
- * \brief print the actual stack frame.
+/*
+ * print the actual stack frame.
  */
 void wc_backtrace(void)
 {
@@ -970,4 +795,6 @@ void wc_backtrace(void)
 #endif
 }
 
-/*@}*/
+
+
+