X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=db093ea4ca39fe988d7aebb24afacbb59bfd3641;hb=3d6fea2eca29405b8a90d91ee862e5a30aebdd3b;hp=4993a6d0e75a2eec3c4beb93440aaecd62676cb4;hpb=c438a531e89d9eee93eb6b8237ffdeabfbc837fe;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 4993a6d0e..db093ea4c 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,32 +1,33 @@
 /*
  * $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-2008 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;            /**< Nonzero if server is shutting 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 */
+extern void *context_loop(int*);
 extern void *housekeeping_loop(void);
 extern pthread_mutex_t SessionListMutex;
 extern pthread_key_t MyConKey;
@@ -37,45 +38,48 @@ 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 */
+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 */
+static 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 */
+	"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? */
+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
+/* 
+ * 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 Number of incoming connections to allow in the queue
+ *
+ * ip_addr 	IP address to bind
+ * port_number	port number to bind
+ * queue_len	number of incoming connections to allow in the queue
  */
 int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
 {
@@ -105,11 +109,16 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
 		lprintf(1, "Can't create a socket: %s\n", strerror(errno));
 		exit(WC_EXIT_BIND);
 	}
-	/** Set some socket options that make sense. */
+	/* Set some socket options that make sense. */
 	i = 1;
 	setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
 
-	fcntl(s, F_SETFL, O_NONBLOCK);/// TODO
+	#ifndef __APPLE__
+	fcntl(s, F_SETFL, O_NONBLOCK); /* maide: this statement is incorrect
+					  there should be a preceding F_GETFL
+					  and a bitwise OR with the previous
+					  fd flags */
+	#endif
 	
 	if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
 		lprintf(1, "Can't bind: %s\n", strerror(errno));
@@ -124,10 +133,10 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
 
 
 
-/**
- * \brief Create a Unix domain socket and listen on it
- * \param sockpath file name of the unix domain socket
- * \param queue_len Number of incoming connections to allow in the queue
+/*
+ * Create a Unix domain socket and listen on it
+ * sockpath - file name of the unix domain socket
+ * queue_len - Number of incoming connections to allow in the queue
  */
 int ig_uds_server(char *sockpath, int queue_len)
 {
@@ -140,8 +149,8 @@ int ig_uds_server(char *sockpath, int 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",
+	if ((i != 0) && (errno != ENOENT)) {
+		lprintf(1, "webcit: can't unlink %s: %s\n",
 			sockpath, strerror(errno));
 		exit(WC_EXIT_BIND);
 	}
@@ -152,19 +161,19 @@ int ig_uds_server(char *sockpath, int queue_len)
 
 	s = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (s < 0) {
-		lprintf(1, "citserver: Can't create a socket: %s\n",
+		lprintf(1, "webcit: 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",
+		lprintf(1, "webcit: 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",
+		lprintf(1, "webcit: Can't listen: %s\n",
 			strerror(errno));
 		exit(WC_EXIT_BIND);
 	}
@@ -176,302 +185,315 @@ int ig_uds_server(char *sockpath, int queue_len)
 
 
 
-/**
- * \brief Read data from the client socket.
- * \param sock socket fd to read from
- * \param buf buffer to read into 
- * \param bytes number of bytes to read
- * \param timeout Number of seconds to wait before timing out
- * \return values are\
- *      1       Requested number of bytes has been read.\
- *      0       Request timed out.\
- *	   -1   	Connection is broken, or other error.
+/*
+ * Read data from the client socket.
+ *
+ * sock		socket fd to read from
+ * buf		buffer to read into 
+ * bytes	number of bytes to read
+ * timeout	Number of seconds to wait before timing out
+ *
+ * Possible return values:
+ *      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 client_read_to(int *sock, StrBuf *Target, StrBuf *Buf, int bytes, int timeout)
 {
-	int len, rlen;
-	fd_set rfds;
-	struct timeval tv;
-	int retval;
-
+	const char *Error;
+	int retval = 0;
 
 #ifdef HAVE_OPENSSL
 	if (is_https) {
-		return (client_read_ssl(buf, bytes, timeout));
-	}
+		while ((StrLength(Buf) + StrLength(Target) < bytes) &&
+		       (retval >= 0))
+			retval = client_read_sslbuffer(Buf, timeout);
+		if (retval >= 0) {
+			StrBufAppendBuf(Target, Buf, 0); /// todo: Buf > bytes?
+#ifdef HTTP_TRACING
+			write(2, "\033[32m", 5);
+			write(2, buf, bytes);
+			write(2, "\033[30m", 5);
 #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);
+			return 1;
 		}
-
-		rlen = read(sock, &buf[len], bytes - len);
-
-		if (rlen < 1) {
-			lprintf(2, "client_read() failed: %s\n",
-				strerror(errno));
-			return (-1);
+		else {
+			lprintf(2, "client_read_ssl() failed\n");
+			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);
-		}
+	if (StrLength(Buf) > 0) {//// todo: what if Buf > bytes?
+		StrBufAppendBuf(Target, Buf, 0);
 	}
-#ifdef HAVE_OPENSSL
-	if (is_https) {
-		client_write_ssl((char *) buf, count);
-		return (count);
+	retval = StrBufReadBLOB(Target, 
+			   sock, 
+			   (StrLength(Target) > 0), 
+			   bytes - StrLength(Target), 
+				&Error);
+	if (retval < 0) {
+		lprintf(2, "client_read() failed: %s\n",
+			Error);
+		return retval;
 	}
-#endif
+
 #ifdef HTTP_TRACING
-	write(2, "\033[34m", 5);
-	write(2, buf, count);
+	write(2, "\033[32m", 5);
+	write(2, buf, bytes);
 	write(2, "\033[30m", 5);
 #endif
-	return (write(WC->http_sock, buf, count));
+	return 1;
 }
 
-/**
- * \brief Begin buffering HTTP output so we can transmit it all in one write operation later.
+
+/*
+ * Begin buffering HTTP output so we can transmit it all in one write operation later.
  */
 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);
+	if (WC->WBuf == NULL)
+		WC->WBuf = NewStrBufPlain(NULL, 32768);
 }
 
 
-/**
- * \brief uses the same calling syntax as compress2(), but it
- * creates a stream compatible with HTTP "Content-encoding: gzip"
+/*
+ * Finish buffering HTTP output.  [Compress using zlib and] output with a Content-Length: header.
  */
-#ifdef HAVE_ZLIB
-#define DEF_MEM_LEVEL 8 /**< memlevel??? */
-#define OS_CODE 0x03	/**< unix */
-int ZEXPORT compress_gzip(Bytef * dest,         /**< compressed buffer*/
-			  size_t * destLen,     /**< length of the compresed data */
-			  const Bytef * source, /**< source to encode */
-			  uLong sourceLen,      /**< length of source to encode */
-			  int level)            /**< compression level */
+long end_burst(void)
 {
-	const int gz_magic[2] = { 0x1f, 0x8b };	/** gzip magic header */
-
-	/** write gzip header */
-	snprintf((char *) dest, *destLen, 
-		 "%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;
+	struct wcsession *WCC = WC;
+        const char *ptr, *eptr;
+        long count;
+	ssize_t res;
+        fd_set wset;
+        int fdflags;
+
+#ifdef HAVE_ZLIB
+	/* Perform gzip compression, if enabled and supported by client */
+	if ((WCC->gzip_ok) && CompressBuffer(WCC->WBuf))
+	{
+		hprintf("Content-encoding: gzip\r\n");
 	}
-	err = deflateEnd(&stream);
-	return err;
-}
-#endif
+#endif	/* HAVE_ZLIB */
 
-/**
- * \brief Finish buffering HTTP output.  [Compress using zlib and] output with a Content-Length: header.
- */
-void end_burst(void)
-{
-	size_t the_len;
-	char *the_data;
+	hprintf("Content-length: %d\r\n\r\n", StrLength(WCC->WBuf));
 
-	if (WC->burst == NULL)
-		return;
+	ptr = ChrPtr(WCC->HBuf);
+	count = StrLength(WCC->HBuf);
+	eptr = ptr + count;
 
-	the_len = WC->burst_len;
-	the_data = WC->burst;
+#ifdef HAVE_OPENSSL
+	if (is_https) {
+		client_write_ssl(WCC->HBuf);
+		client_write_ssl(WCC->WBuf);
+		return (count);
+	}
+#endif
 
-	WC->burst_len = 0;
-	WC->burst_alloc = 0;
-	WC->burst = NULL;
+	
+#ifdef HTTP_TRACING
+	
+	write(2, "\033[34m", 5);
+	write(2, ptr, StrLength(WCC->WBuf));
+	write(2, "\033[30m", 5);
+#endif
+	fdflags = fcntl(WC->http_sock, F_GETFL);
+
+	while (ptr < eptr) {
+                if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
+                        FD_ZERO(&wset);
+                        FD_SET(WCC->http_sock, &wset);
+                        if (select(WCC->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
+                                lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
+                                return -1;
+                        }
+                }
+
+                if ((res = write(WCC->http_sock, 
+				 ptr,
+				 count)) == -1) {
+                        lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
+		        wc_backtrace();
+                        return res;
+                }
+                count -= res;
+		ptr += res;
+        }
+
+	ptr = ChrPtr(WCC->WBuf);
+	count = StrLength(WCC->WBuf);
+	eptr = ptr + count;
 
-#ifdef HAVE_ZLIB
-	/* Perform gzip compression, if enabled and supported by client */
-	if (WC->gzip_ok) {
-		char *compressed_data = NULL;
-		size_t compressed_len;
-
-		compressed_len = ((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 */
+#ifdef HTTP_TRACING
+	
+	write(2, "\033[34m", 5);
+	write(2, ptr, StrLength(WCC->WBuf));
+	write(2, "\033[30m", 5);
+#endif
 
-	wprintf("Content-length: %d\r\n\r\n", the_len);
-	client_write(the_data, the_len);
-	free(the_data);
-	return;
+        while (ptr < eptr) {
+                if ((fdflags & O_NONBLOCK) == O_NONBLOCK) {
+                        FD_ZERO(&wset);
+                        FD_SET(WCC->http_sock, &wset);
+                        if (select(WCC->http_sock + 1, NULL, &wset, NULL, NULL) == -1) {
+                                lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno));
+                                return -1;
+                        }
+                }
+
+                if ((res = write(WCC->http_sock, 
+				 ptr,
+				 count)) == -1) {
+                        lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno));
+			wc_backtrace();
+                        return res;
+                }
+                count -= res;
+		ptr += res;
+        }
+
+	return StrLength(WCC->WBuf);
 }
 
 
 
-/**
- * \brief Read data from the client socket with default timeout.
+/*
+ * 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 Number of bytes to read
+ *
+ * sock		the socket fd to read from
+ * buf		the buffer to write to
+ * bytes	Number of bytes to read
  */
-int client_read(int sock, char *buf, int bytes)
+int client_read(int *sock, StrBuf *Target, StrBuf *buf, int bytes)
 {
-	return (client_read_to(sock, buf, bytes, SLEEPING));
+	return (client_read_to(sock, Target, buf, bytes, SLEEPING));
 }
 
 
-/**
- * \brief Get a LF-terminated line of text from the client.
+/*
+ * 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  number of bytes read???
+ *
+ * sock		socket fd to get client line from
+ * buf		buffer to write read data to
+ * bufsiz	how many bytes to read
+ *
+ * returns the number of bytes read
  */
-int client_getln(int sock, char *buf, int bufsiz)
+/////int client_getln(int *sock, char *buf, int bufsiz)
+/////{
+/////	int i, retval;
+/////
+/////	/* Read one character at a time.*/
+/////	for (i = 0; *sock > 0; i++) {
+/////		retval = client_read(sock, &buf[i], 1);
+/////		if (retval < 0)
+/////			return retval;
+/////		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);
+/////}
+
+/*
+ * 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);
+}
+
+
+int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf)
 {
-	int i, retval;
+	const char *Error, *pch, *pchs;
+	int rlen, len, retval = 0;
 
-	/** 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 (is_https) {
+		int ntries = 0;
+		if (StrLength(CLineBuf) > 0) {
+			pchs = ChrPtr(CLineBuf);
+			pch = strchr(pchs, '\n');
+			if (pch != NULL) {
+				rlen = 0;
+				len = pch - pchs;
+				if (len > 0 && (*(pch - 1) == '\r') )
+					rlen ++;
+				StrBufSub(Target, CLineBuf, 0, len - rlen);
+				StrBufCutLeft(CLineBuf, len + 1);
+				return len - rlen;
+			}
 		}
-	}
 
-	/** 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);
+		while (retval == 0) { 
+				pch = NULL;
+				pchs = ChrPtr(CLineBuf);
+				if (*pchs != '\0')
+					pch = strchr(pchs, '\n');
+				if (pch == NULL) {
+					retval = client_read_sslbuffer(CLineBuf, SLEEPING);
+					pchs = ChrPtr(CLineBuf);
+					pch = strchr(pchs, '\n');
+				}
+				if (retval == 0) {
+					sleeeeeeeeeep(1);
+					ntries ++;
+				}
+				if (ntries > 10)
+					return 0;
+		}
+		if ((retval > 0) && (pch != NULL)) {
+			rlen = 0;
+			len = pch - pchs;
+			if (len > 0 && (*(pch - 1) == '\r') )
+				rlen ++;
+			StrBufSub(Target, CLineBuf, 0, len - rlen);
+			StrBufCutLeft(CLineBuf, len + 1);
+			return len - rlen;
 
-	/**
-	 * Strip any trailing non-printable characters.
-	 */
-	buf[i] = 0;
-	while ((i > 0) && (!isprint(buf[i - 1]))) {
-		buf[--i] = 0;
+		}
+		else 
+			return -1;
 	}
-	return (retval);
+	else 
+		return StrBufTCP_read_buffered_line(Target, 
+						    CLineBuf,
+						    sock,
+						    5,
+						    1,
+						    &Error);
 }
 
-/**
- * \brief shut us down the regular way.
- * param signum 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);
-}
 
-/**
- * \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) {
@@ -491,12 +513,6 @@ void graceful_shutdown(int signum) {
 }
 
 
-/**
- * \brief	Start running as a daemon.  
- *
- * param	do_close_stdio		Only close stdio if set.
- */
-
 /*
  * Start running as a daemon.
  */
@@ -538,17 +554,18 @@ 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(SIGTERM, graceful_shutdown);
 			signal(SIGHUP, graceful_shutdown);
 
 			return; /* continue starting webcit. */
 		}
 	
-		else {
+		else { // watcher process
 //			signal(SIGTERM, SIG_IGN);
 //			signal(SIGHUP, SIG_IGN);
 			if (pid_file) {
@@ -592,25 +609,26 @@ 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");
 
-	/** 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.
@@ -621,27 +639,34 @@ 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 
+void InitTemplateCache(void);
+extern int LoadTemplates;
+extern void LoadZoneFiles(void);
+
+/*
+ * 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 */
+	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]="";
@@ -657,15 +682,43 @@ int main(int argc, char **argv)
 	char *locale = NULL;
 	char *mo = NULL;
 #endif /* ENABLE_NLS */
-	char uds_listen_path[PATH_MAX];	/**< listen on a unix domain socket? */
+	char uds_listen_path[PATH_MAX];	/* listen on a unix domain socket? */
+
+	HandlerHash = NewHash(1, NULL);
+	PreferenceHooks = NewHash(1, NULL);
+	WirelessTemplateCache = NewHash(1, NULL);
+	WirelessLocalTemplateCache = NewHash(1, NULL);
+	LocalTemplateCache = NewHash(1, NULL);
+	TemplateCache = NewHash(1, NULL);
+	GlobalNS = NewHash(1, NULL);
+	Iterators = NewHash(1, NULL);
+	Contitionals = NewHash(1, NULL);
+	MsgHeaderHandler = NewHash(1, NULL);
+	MimeRenderHandler = NewHash(1, NULL);
+
+	LoadZoneFiles();
+
+
+#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:x:dD:cfs")) != 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:x:dD:cf")) != EOF)
 #endif
 		switch (a) {
 		case 'h':
@@ -702,6 +755,9 @@ int main(int argc, char **argv)
 			freopen(tracefile, "w", stderr);
 			freopen(tracefile, "r", stdin);
 			break;
+		case 'T':
+			LoadTemplates = atoi(optarg);
+			break;
 		case 'x':
 			verbosity = atoi(optarg);
 			break;
@@ -727,9 +783,10 @@ int main(int argc, char **argv)
 			is_https = 1;
 			break;
 		default:
-			fprintf(stderr, "usage: webserver "
+			fprintf(stderr, "usage: webcit "
 				"[-i ip_addr] [-p http_port] "
 				"[-t tracefile] [-c] [-f] "
+				"[-T Templatedebuglevel] "
 				"[-d] "
 #ifdef HAVE_OPENSSL
 				"[-s] "
@@ -753,7 +810,7 @@ int main(int argc, char **argv)
 		signal(SIGHUP, graceful_shutdown);
 	}
 
-	/** Tell 'em who's in da house */
+	/* Tell 'em who's in da house */
 	lprintf(1, PACKAGE_STRING "\n");
 	lprintf(1, "Copyright (C) 1996-2008 by the Citadel development team.\n"
 		"This software is distributed under the terms of the "
@@ -761,15 +818,18 @@ int main(int argc, char **argv)
 	);
 
 
-	/** initialize the International Bright Young Thing */
+	/* 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"));
+	preset_locale();
 #endif
 
 
@@ -789,6 +849,8 @@ int main(int argc, char **argv)
 	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);
 
@@ -805,15 +867,22 @@ int main(int argc, char **argv)
 		 "%s/citadel.cer",
 		 ctdl_key_dir);
 
-	/** we should go somewhere we can leave our coredump, if enabled... */
+	/* 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");
 	}
+	LoadIconDir(static_icon_dir);
+	InitTemplateCache();
+
+	initialise_modules();
 	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;
+
+	/*
 	 * 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.
@@ -823,7 +892,7 @@ int main(int argc, char **argv)
 	}
 	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
@@ -835,7 +904,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.
@@ -855,7 +924,7 @@ int main(int argc, char **argv)
 
 	pthread_mutex_init(&SessionListMutex, NULL);
 
-	/**
+	/*
 	 * Start up the housekeeping thread
 	 */
 	pthread_attr_init(&attr);
@@ -864,7 +933,7 @@ int main(int argc, char **argv)
 		       (void *(*)(void *)) housekeeping_loop, NULL);
 
 
-	/**
+	/*
 	 * If this is an HTTPS server, fire up SSL
 	 */
 #ifdef HAVE_OPENSSL
@@ -873,18 +942,49 @@ 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 ();
+	DeleteHash(&HandlerHash);
+	DeleteHash(&PreferenceHooks);
 	return 0;
 }
 
 
-/**
+void ShutDownWebcit(void)
+{
+	DeleteHash(&ZoneHash);
+	free_zone_directory ();
+	icaltimezone_release_zone_tab ();
+	icalmemory_free_ring ();
+	ShutDownLibCitadel ();
+	DeleteHash(&HandlerHash);
+	DeleteHash(&PreferenceHooks);
+	DeleteHash(&GlobalNS);
+	DeleteHash(&WirelessTemplateCache);
+	DeleteHash(&WirelessLocalTemplateCache);
+	DeleteHash(&TemplateCache);
+	DeleteHash(&LocalTemplateCache);
+	DeleteHash(&Iterators);
+	DeleteHash(&MimeRenderHandler);
+	DeleteHash(&Contitionals);
+	DeleteHash(&MsgHeaderHandler);
+#ifdef ENABLE_NLS
+	ShutdownLocale();
+#endif
+#ifdef HAVE_OPENSSL
+	if (is_https) {
+		shutdown_ssl();
+	}
+#endif
+}
+
+/*
  * Entry point for worker threads
  */
 void worker_entry(void)
@@ -902,7 +1002,7 @@ void worker_entry(void)
 	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 = -1; 
 		errno = EAGAIN;
@@ -950,12 +1050,10 @@ void worker_entry(void)
 				sleeeeeeeeeep(1); // wait so some others might finish...
 				lprintf(2, "master shutdown: cleaning up sessions\n");
 				do_housekeeping();
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
 				lprintf(2, "master shutdown: cleaning up libical\n");
-				free_zone_directory ();
-				icaltimezone_release_zone_tab ();
-				icalmemory_free_ring ();
-#endif
+
+				ShutDownWebcit();
+
 				lprintf(2, "master shutdown exiting!.\n");				
 				exit(0);
 			}
@@ -968,12 +1066,12 @@ void worker_entry(void)
 			lprintf(2, "inbetween.");
 			pthread_exit(NULL);
 		} else { // Got it? do some real work!
-			/** Set the SO_REUSEADDR socket option */
+			/* 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) {
@@ -985,18 +1083,19 @@ void worker_entry(void)
 
 			if (fail_this_transaction == 0) {
 
-				/** Perform an HTTP transaction... */
-				context_loop(ssock);
+				/* Perform an HTTP transaction... */
+				context_loop(&ssock);
 
-				/** 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 (ssock > 0)
+					lingering_close(ssock);
 			}
 
 		}
@@ -1007,12 +1106,13 @@ void worker_entry(void)
 	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, ...)
 {
@@ -1028,8 +1128,8 @@ int lprintf(int loglevel, const char *format, ...)
 }
 
 
-/**
- * \brief print the actual stack frame.
+/*
+ * print the actual stack frame.
  */
 void wc_backtrace(void)
 {
@@ -1051,4 +1151,3 @@ void wc_backtrace(void)
 #endif
 }
 
-/*@}*/