X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=dab22a9dec5ca80f923513db079be354799f8584;hb=77ad06c3f4bf4d2a4e3a7ff82ec94fcdff343273;hp=aa2863895184b461f9a2caefb80adaacfbf90489;hpb=20a2e64d9f1dfbb5c9922d7aae188bec39fba3a3;p=citadel.git

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index aa2863895..dab22a9de 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -14,31 +14,56 @@
 /* Only one thread may manipulate SessionList at a time... */
 pthread_mutex_t SessionListMutex;
 
-struct wcsession *SessionList = NULL;
+wcsession *SessionList = NULL; /**< our sessions ????*/
 
-pthread_key_t MyConKey;                         /* TSD key for MySession() */
+pthread_key_t MyConKey;         /**< TSD key for MySession() */
 
 
-void free_attachments(struct wcsession *sess) {
-	struct wc_attachment *att;
 
-	while (sess->first_attachment != NULL) {
-		att = sess->first_attachment;
-		sess->first_attachment = sess->first_attachment->next;
-		free(att->data);
-		free(att);
+void DestroySession(wcsession **sessions_to_kill)
+{
+	close((*sessions_to_kill)->serv_sock);
+	close((*sessions_to_kill)->chat_sock);
+/*
+//		if ((*sessions_to_kill)->preferences != NULL) {
+//			free((*sessions_to_kill)->preferences);
+//		}
+*/
+	if ((*sessions_to_kill)->cache_fold != NULL) {
+		free((*sessions_to_kill)->cache_fold);
 	}
+	DeleteHash(&((*sessions_to_kill)->attachments));
+	free_march_list((*sessions_to_kill));
+	DeleteHash(&((*sessions_to_kill)->hash_prefs));
+	DeleteHash(&((*sessions_to_kill)->IconBarSetttings));
+	DeleteHash(&((*sessions_to_kill)->ServCfg));
+	FreeStrBuf(&((*sessions_to_kill)->UrlFragment1));
+	FreeStrBuf(&((*sessions_to_kill)->UrlFragment2));
+	FreeStrBuf(&((*sessions_to_kill)->UrlFragment3));
+	FreeStrBuf(&((*sessions_to_kill)->WBuf));
+	FreeStrBuf(&((*sessions_to_kill)->HBuf));
+	FreeStrBuf(&((*sessions_to_kill)->CLineBuf));
+	free((*sessions_to_kill));
+	(*sessions_to_kill) = NULL;
 }
 
+void shutdown_sessions(void)
+{
+	wcsession *sptr;
+	
+	for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
+			sptr->killthis = 1;
+	}
+}
 
 void do_housekeeping(void)
 {
-	struct wcsession *sptr, *ss;
-	struct wcsession *sessions_to_kill = NULL;
+	wcsession *sptr, *ss;
+	wcsession *sessions_to_kill = NULL;
 	int num_sessions = 0;
 	static int num_threads = MIN_WORKER_THREADS;
 
-	/*
+	/**
 	 * Lock the session list, moving any candidates for euthanasia into
 	 * a separate list.
 	 */
@@ -47,16 +72,16 @@ void do_housekeeping(void)
 	for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
 		++num_sessions;
 
-		/* Kill idle sessions */
+		/** Kill idle sessions */
 		if ((time(NULL) - (sptr->lastreq)) >
 		   (time_t) WEBCIT_TIMEOUT) {
 			sptr->killthis = 1;
 		}
 
-		/* Remove sessions flagged for kill */
+		/** Remove sessions flagged for kill */
 		if (sptr->killthis) {
 
-			/* remove session from linked list */
+			/** remove session from linked list */
 			if (sptr == SessionList) {
 				SessionList = SessionList->next;
 			}
@@ -72,26 +97,21 @@ void do_housekeeping(void)
 	}
 	pthread_mutex_unlock(&SessionListMutex);
 
-	/*
+	/**
 	 * Now free up and destroy the culled sessions.
 	 */
 	while (sessions_to_kill != NULL) {
 		lprintf(3, "Destroying session %d\n", sessions_to_kill->wc_session);
 		pthread_mutex_lock(&sessions_to_kill->SessionMutex);
-		close(sessions_to_kill->serv_sock);
-		close(sessions_to_kill->chat_sock);
-		if (sessions_to_kill->preferences != NULL) {
-			free(sessions_to_kill->preferences);
-		}
-		free_attachments(sessions_to_kill);
 		pthread_mutex_unlock(&sessions_to_kill->SessionMutex);
 		sptr = sessions_to_kill->next;
-		free(sessions_to_kill);
+
+		DestroySession(&sessions_to_kill);
 		sessions_to_kill = sptr;
 		--num_sessions;
 	}
 
-	/*
+	/**
 	 * If there are more sessions than threads, then we should spawn
 	 * more threads ... up to a predefined maximum.
 	 */
@@ -105,8 +125,8 @@ void do_housekeeping(void)
 }
 
 
-/* 
- * Wake up occasionally and clean house
+/**
+ * \brief Wake up occasionally and clean house
  */
 void housekeeping_loop(void)
 {
@@ -117,11 +137,12 @@ void housekeeping_loop(void)
 }
 
 
-/*
+/**
+ * \brief Create a Session id
  * Generate a unique WebCit session ID (which is not the same thing as the
  * Citadel session ID).
  *
- * FIXME ... ensure that session number is truly unique
+ * \todo FIXME ... ensure that session number is truly unique
  *
  */
 int GenerateSessionID(void)
@@ -135,42 +156,21 @@ int GenerateSessionID(void)
 	return ++seq;
 }
 
-
 /*
  * Collapse multiple cookies on one line
  */
-int req_gets(int sock, char *buf, char *hold)
+int ReqGetStrBuf(int *sock, StrBuf *Target, StrBuf *buf)
 {
-	int a;
-
-	if (strlen(hold) == 0) {
-		strcpy(buf, "");
-		a = client_getln(sock, buf, SIZ);
-		if (a<1) return(-1);
-	} else {
-		safestrncpy(buf, hold, SIZ);
-	}
-	strcpy(hold, "");
-
-	if (!strncasecmp(buf, "Cookie: ", 8)) {
-		for (a = 0; a < strlen(buf); ++a)
-			if (buf[a] == ';') {
-				sprintf(hold, "Cookie: %s", &buf[a + 1]);
-				buf[a] = 0;
-				while (isspace(hold[8]))
-					strcpy(&hold[8], &hold[9]);
-				return(0);
-			}
-	}
-
-	return(0);
+	
+	return ClientGetLine(sock, Target, buf);
 }
 
+
+
 /*
  * lingering_close() a`la Apache. see
  * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
  */
-
 int lingering_close(int fd)
 {
 	char buf[SIZ];
@@ -205,24 +205,44 @@ int lingering_close(int fd)
 
 
 
-/*
- * Check for bogus requests coming from (for example) brain-dead
- * Windoze boxes that are infected with the latest worm-of-the-week.
- * If we detect one of these, bail out without bothering our Citadel
- * server.
+/**
+ * \brief	sanity requests
+ *		Check for bogus requests coming from brain-dead Windows boxes.
+ *
+ * \param	http_cmd	The HTTP request to check
  */
-int is_bogus(char *http_cmd) {
-
-	if (!strncasecmp(http_cmd, "GET /scripts/root.exe", 21)) return(1);
-	if (!strncasecmp(http_cmd, "GET /c/winnt", 12)) return(2);
-	if (!strncasecmp(http_cmd, "GET /MSADC/", 11)) return(3);
+int is_bogus(StrBuf *http_cmd) {
+	const char *url;
+	int i, max;
+	const char *bogus_prefixes[] = {
+		"/scripts/root.exe",	/**< Worms and trojans and viruses, oh my! */
+		"/c/winnt",
+		"/MSADC/",
+		"/_vti",		/**< Broken Microsoft DAV implementation */
+		"/MSOffice"		/**< Stoopid MSOffice thinks everyone is IIS */
+	};
+
+	url = ChrPtr(http_cmd);
+	if (IsEmptyStr(url)) return(1);
+	++url;
+
+
+	max = sizeof(bogus_prefixes) / sizeof(char *);
+
+	for (i=0; i<max; ++i) {
+		if (!strncasecmp(url, bogus_prefixes[i], strlen(bogus_prefixes[i]))) {
+			return(2);
+		}
+	}
 
 	return(0);	/* probably ok */
 }
 
 
+const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}
 
-/*
+/**
+ * \brief handle one request
  * This loop gets called once for every HTTP connection made to WebCit.  At
  * this entry point we have an HTTP socket with a browser allegedly on the
  * other end, but we have not yet bound to a WebCit session.
@@ -232,144 +252,217 @@ int is_bogus(char *http_cmd) {
  * transaction loop.  Afterwards, we unbind from the session.  When this
  * function returns, the worker thread is then free to handle another
  * transaction.
+ * \param sock the socket we will put our answer to
  */
-void context_loop(int sock)
+void context_loop(int *sock)
 {
-	struct httprequest *req = NULL;
-	struct httprequest *last = NULL;
-	struct httprequest *hptr;
-	char buf[SIZ], hold[SIZ];
+	const char *buf;
 	int desired_session = 0;
 	int got_cookie = 0;
 	int gzip_ok = 0;
-	struct wcsession *TheSession, *sptr;
-	char httpauth_string[SIZ];
-	char httpauth_user[SIZ];
-	char httpauth_pass[SIZ];
+	wcsession *TheSession, *sptr;
+	char httpauth_string[1024];
+	char httpauth_user[1024];
+	char httpauth_pass[1024];
 	char *ptr = NULL;
+	int session_is_new = 0;
+	int nLine = 0;
+	int LineLen;
+	void *vLine;
+	StrBuf *Buf, *Line, *LastLine, *HeaderName, *ReqLine, *ReqType, *HTTPVersion;
+	StrBuf *accept_language = NULL;
+	const char *pch, *pchs, *pche;
+	HashList *HTTPHeaders;
 
 	strcpy(httpauth_string, "");
 	strcpy(httpauth_user, DEFAULT_HTTPAUTH_USER);
 	strcpy(httpauth_pass, DEFAULT_HTTPAUTH_PASS);
 
-	/*
+	/**
 	 * Find out what it is that the web browser is asking for
 	 */
-	memset(hold, 0, sizeof(hold));
+	HeaderName = NewStrBuf();
+	Buf = NewStrBuf();
+	LastLine = NULL;
+	HTTPHeaders = NewHash(1, NULL);
+	/**
+	 * Read in the request
+	 */
 	do {
-		if (req_gets(sock, buf, hold) < 0) return;
-
-		/*
-		 * Can we compress?
-		 */
-		if (!strncasecmp(buf, "Accept-encoding:", 16)) {
-			if (strstr(&buf[16], "gzip")) {
-				gzip_ok = 1;
-			}
-		}
+		nLine ++;
+		Line = NewStrBuf();
+		if (ReqGetStrBuf(sock, Line, Buf) < 0) return;
 
-		/*
-		 * Browser-based sessions use cookies for session authentication
-		 */
-		if (!strncasecmp(buf, "Cookie: webcit=", 15)) {
-			cookie_to_stuff(&buf[15], &desired_session,
-				NULL, 0, NULL, 0, NULL, 0);
-			got_cookie = 1;
-		}
+		LineLen = StrLength(Line);
 
-		/*
-		 * GroupDAV-based sessions use HTTP authentication
-		 */
-		if (!strncasecmp(buf, "Authorization: Basic ", 21)) {
-			CtdlDecodeBase64(httpauth_string, &buf[21], strlen(&buf[21]));
-			extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
-			extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
+		if (nLine == 1) {
+			ReqLine = Line;
+			continue;
 		}
-
-		if (!strncasecmp(buf, "If-Modified-Since: ", 19)) {
-			if_modified_since = httpdate_to_timestamp(&buf[19]);
+		if (LineLen == 0) {
+			FreeStrBuf(&Line);
+			continue;
 		}
 
-		if (!strncasecmp(buf, "Accept-Language: ", 17)) {
-			httplang_to_locale(&buf[17]);
+		/** Do we need to Unfold? */
+		if ((LastLine != NULL) && 
+		    (isspace(*ChrPtr(Line)))) {
+			pch = pchs = ChrPtr(Line);
+			pche = pchs + StrLength(Line);
+			while (isspace(*pch) && (pch < pche))
+				pch ++;
+			StrBufCutLeft(Line, pch - pchs);
+			StrBufAppendBuf(LastLine, Line, 0);
+			FreeStrBuf(&Line);
+			continue;
 		}
 
-		/*
-		 * Read in the request
-		 */
-		hptr = (struct httprequest *)
-			malloc(sizeof(struct httprequest));
-		if (req == NULL)
-			req = hptr;
-		else
-			last->next = hptr;
-		hptr->next = NULL;
-		last = hptr;
+		StrBufExtract_token(HeaderName, Line, 0, ':');
+		/*/// TODO: filter bad chars! */
 
-		safestrncpy(hptr->line, buf, sizeof hptr->line);
+		pchs = ChrPtr(Line);
+		pch = pchs + StrLength(HeaderName) + 1;
+		pche = pchs + StrLength(Line);
+		while (isspace(*pch) && (pch < pche))
+			pch ++;
+		StrBufCutLeft(Line, pch - pchs);
 
-	} while (strlen(buf) > 0);
+		StrBufUpCase(HeaderName);
+		Put(HTTPHeaders, SKEY(HeaderName), Line, HFreeStrBuf);
+		LastLine = Line;
+	} while (LineLen > 0);
+	FreeStrBuf(&HeaderName);
 
-	/*
-	 * If the request is prefixed by "/webcit" then chop that off.  This
-	 * allows a front end web server to forward all /webcit requests to us
-	 * while still using the same web server port for other things.
+/*///	dbg_PrintHash(HTTPHeaders, nix, NULL); */
+
+
+	/**
+	 * Can we compress?
 	 */
-	
-	ptr = strstr(req->line, " /webcit ");	/* Handle "/webcit" */
-	if (ptr != NULL) {
-		strcpy(ptr+2, ptr+8);
+	if (GetHash(HTTPHeaders, HKEY("ACCEPT-ENCODING"), &vLine) && 
+	    (vLine != NULL)) {
+		buf = ChrPtr((StrBuf*)vLine);
+		if (strstr(&buf[16], "gzip")) {
+			gzip_ok = 1;
+		}
 	}
 
-	ptr = strstr(req->line, " /webcit");	/* Handle "/webcit/" */
-	if (ptr != NULL) {
-		strcpy(ptr+1, ptr+8);
+	/**
+	 * Browser-based sessions use cookies for session 
+
+authentication
+	 */
+	if (GetHash(HTTPHeaders, HKEY("COOKIE"), &vLine) && 
+	    (vLine != NULL)) {
+		cookie_to_stuff(vLine, &desired_session,
+				NULL, 0, NULL, 0, NULL, 0);
+		got_cookie = 1;
 	}
 
-	/* Begin parsing the request. */
+	/**
+	 * GroupDAV-based sessions use HTTP authentication
+	 */
+	if (GetHash(HTTPHeaders, HKEY("AUTHORIZATION"), &vLine) && 
+	    (vLine != NULL)) {
+		Line = (StrBuf*)vLine;
+		if (strncasecmp(ChrPtr(Line), "Basic", 5) == 0) {
+			StrBufCutLeft(Line, 6);
+			CtdlDecodeBase64(httpauth_string, ChrPtr(Line), StrLength(Line));
+			extract_token(httpauth_user, httpauth_string, 0, ':', sizeof httpauth_user);
+			extract_token(httpauth_pass, httpauth_string, 1, ':', sizeof httpauth_pass);
+		}
+		else 
+			lprintf(1, "Authentication scheme not supported! [%s]\n", ChrPtr(Line));
+	}
+
+	if (GetHash(HTTPHeaders, HKEY("IF-MODIFIED-SINCE"), &vLine) && 
+	    (vLine != NULL)) {
+		if_modified_since = httpdate_to_timestamp((StrBuf*)vLine);
+	}
 
-	safestrncpy(buf, req->line, sizeof buf);
-	lprintf(5, "HTTP: %s\n", buf);
+	if (GetHash(HTTPHeaders, HKEY("ACCEPT-LANGUAGE"), &vLine) && 
+	    (vLine != NULL)) {
+		accept_language = (StrBuf*) vLine;
+	}
 
-	/* Check for bogus requests */
-	if (is_bogus(buf)) goto bail;
 
-	/*
-	 * Strip out the method, leaving the URL up front...
+	/**
+	 * If the request is prefixed by "/webcit" then chop that off.  This
+	 * allows a front end web server to forward all /webcit requests to us
+	 * while still using the same web server port for other things.
 	 */
-	remove_token(buf, 0, ' ');
-	if (buf[1]==' ') buf[1]=0;
 
-	/*
+	ReqType = NewStrBuf();
+	HTTPVersion = NewStrBuf();
+	StrBufExtract_token(HTTPVersion, ReqLine, 2, ' ');
+	StrBufExtract_token(ReqType, ReqLine, 0, ' ');
+	StrBufCutLeft(ReqLine, StrLength(ReqType) + 1);
+	StrBufCutRight(ReqLine, StrLength(HTTPVersion) + 1);
+
+	if ((follow_xff == 1) && (StrLength(ReqLine) >= 8) &&
+	    (ptr = strstr(ChrPtr(ReqLine), "/webcit/"),	/*< Handle "/webcit/" */
+	     (ptr != NULL))) {
+		StrBufCutLeft(ReqLine, 7);
+	}
+
+	/** Begin parsing the request. */
+#ifdef TECH_PREVIEW
+	if ((strncmp(ChrPtr(ReqLine), "/sslg", 5) != 0) &&
+	    (strncmp(ChrPtr(ReqLine), "/static/", 8) != 0) &&
+	    (strncmp(ChrPtr(ReqLine), "/tiny_mce/", 10) != 0) &&
+	    (strncmp(ChrPtr(ReqLine), "/wholist_section", 16) != 0) &&
+	    (strstr(ChrPtr(ReqLine), "wholist_section") == NULL)) {
+#endif
+		lprintf(5, "HTTP: %s %s %s\n", ChrPtr(ReqType), ChrPtr(ReqLine), ChrPtr(HTTPVersion));
+#ifdef TECH_PREVIEW
+	}
+#endif
+
+	/** Check for bogus requests */
+	if ((StrLength(HTTPVersion) == 0) ||
+	    (StrLength(ReqType) == 0) || 
+	    is_bogus(ReqLine)) {
+		StrBufPlain(ReqLine, HKEY("/404 HTTP/1.1"));
+		StrBufPlain(ReqType, HKEY("GET"));
+	}
+	FreeStrBuf(&HTTPVersion);
+
+	/**
 	 * While we're at it, gracefully handle requests for the
 	 * robots.txt and favicon.ico files.
 	 */
-	if (!strncasecmp(buf, "/robots.txt", 11)) {
-		strcpy(req->line, "GET /static/robots.txt"
-				"?force_close_session=yes HTTP/1.1");
+	if (!strncasecmp(ChrPtr(ReqLine), "/robots.txt", 11)) {
+		StrBufPlain(ReqLine, 
+			    HKEY("/static/robots.txt"
+				 "?force_close_session=yes HTTP/1.1"));
+		StrBufPlain(ReqType, HKEY("GET"));
 	}
-	else if (!strncasecmp(buf, "/favicon.ico", 12)) {
-		strcpy(req->line, "GET /static/favicon.ico");
+	else if (!strncasecmp(ChrPtr(ReqLine), "/favicon.ico", 12)) {
+		StrBufPlain(ReqLine, HKEY("/static/favicon.ico"));
+		StrBufPlain(ReqType, HKEY("GET"));
 	}
 
-	/* These are the URL's which may be executed without a
+	/**
+	 * These are the URL's which may be executed without a
 	 * session cookie already set.  If it's not one of these,
 	 * force the session to close because cookies are
 	 * probably disabled on the client browser.
 	 */
-	else if ( (strcmp(buf, "/"))
-		&& (strncasecmp(buf, "/listsub", 8))
-		&& (strncasecmp(buf, "/freebusy", 9))
-		&& (strncasecmp(buf, "/do_logout", 10))
-		&& (strncasecmp(buf, "/groupdav", 9))
-		&& (strncasecmp(buf, "/static", 7))
-		&& (strncasecmp(buf, "/rss", 4))
+	else if ( (StrLength(ReqLine) > 1 )
+		&& (strncasecmp(ChrPtr(ReqLine), "/listsub", 8))
+		&& (strncasecmp(ChrPtr(ReqLine), "/freebusy", 9))
+		&& (strncasecmp(ChrPtr(ReqLine), "/do_logout", 10))
+		&& (strncasecmp(ChrPtr(ReqLine), "/groupdav", 9))
+		&& (strncasecmp(ChrPtr(ReqLine), "/static", 7))
+		&& (strncasecmp(ChrPtr(ReqLine), "/rss", 4))
+		&& (strncasecmp(ChrPtr(ReqLine), "/404", 4))
 	        && (got_cookie == 0)) {
-		strcpy(req->line, "GET /static/nocookies.html"
-				"?force_close_session=yes HTTP/1.1");
+		StrBufPlain(ReqLine, 
+			    HKEY("/static/nocookies.html"
+				 "?force_close_session=yes"));
 	}
 
-	/*
+	/**
 	 * See if there's an existing session open with the desired ID or user/pass
 	 */
 	TheSession = NULL;
@@ -378,14 +471,14 @@ void context_loop(int sock)
 		pthread_mutex_lock(&SessionListMutex);
 		for (sptr = SessionList; sptr != NULL; sptr = sptr->next) {
 
-			/* If HTTP-AUTH, look for a session with matching credentials */
-			if ( (strlen(httpauth_user) > 0)
+			/** If HTTP-AUTH, look for a session with matching credentials */
+			if ( (!IsEmptyStr(httpauth_user))
 			   &&(!strcasecmp(sptr->httpauth_user, httpauth_user))
 			   &&(!strcasecmp(sptr->httpauth_pass, httpauth_pass)) ) {
 				TheSession = sptr;
 			}
 
-			/* If cookie-session, look for a session with matching session ID */
+			/** If cookie-session, look for a session with matching session ID */
 			if ( (desired_session != 0) && (sptr->wc_session == desired_session)) {
 				TheSession = sptr;
 			}
@@ -394,25 +487,45 @@ void context_loop(int sock)
 		pthread_mutex_unlock(&SessionListMutex);
 	}
 
-	/*
+	/**
 	 * Create a new session if we have to
 	 */
 	if (TheSession == NULL) {
 		lprintf(3, "Creating a new session\n");
-		TheSession = (struct wcsession *)
-			malloc(sizeof(struct wcsession));
-		memset(TheSession, 0, sizeof(struct wcsession));
+		TheSession = (wcsession *)
+			malloc(sizeof(wcsession));
+		memset(TheSession, 0, sizeof(wcsession));
 		TheSession->serv_sock = (-1);
 		TheSession->chat_sock = (-1);
-		TheSession->wc_session = GenerateSessionID();
+	
+		/* If we're recreating a session that expired, it's best to give it the same
+		 * session number that it had before.  The client browser ought to pick up
+		 * the new session number and start using it, but in some rare situations it
+		 * doesn't, and that's a Bad Thing because it causes lots of spurious sessions
+		 * to get created.
+		 */	
+		if (desired_session == 0) {
+			TheSession->wc_session = GenerateSessionID();
+		}
+		else {
+			TheSession->wc_session = desired_session;
+		}
+
 		strcpy(TheSession->httpauth_user, httpauth_user);
 		strcpy(TheSession->httpauth_pass, httpauth_pass);
+		TheSession->hash_prefs = NewHash(1,NULL);	/* Get a hash table for the user preferences */
 		pthread_mutex_init(&TheSession->SessionMutex, NULL);
-
 		pthread_mutex_lock(&SessionListMutex);
+		TheSession->urlstrings = NULL;
+		TheSession->vars = NULL;
+		TheSession->nonce = rand();
+		TheSession->WBuf = NULL;
+		TheSession->CLineBuf = NewStrBuf();
 		TheSession->next = SessionList;
+		TheSession->is_mobile = -1;
 		SessionList = TheSession;
 		pthread_mutex_unlock(&SessionListMutex);
+		session_is_new = 1;
 	}
 
 	/*
@@ -425,21 +538,54 @@ void context_loop(int sock)
 	 */
 	pthread_mutex_lock(&TheSession->SessionMutex);		/* bind */
 	pthread_setspecific(MyConKey, (void *)TheSession);
-	TheSession->http_sock = sock;
+	
+	TheSession->urlstrings = NewHash(1,NULL);
+	TheSession->vars = NewHash(1,NULL);
+	TheSession->http_sock = *sock;
 	TheSession->lastreq = time(NULL);			/* log */
 	TheSession->gzip_ok = gzip_ok;
-	session_loop(req);				/* do transaction */
+#ifdef ENABLE_NLS
+	if (session_is_new) {
+		httplang_to_locale(accept_language);
+	}
+	go_selected_language();					/* set locale */
+#endif
+	session_loop(HTTPHeaders, ReqLine, ReqType, Buf);				/* do transaction */
+#ifdef ENABLE_NLS
+	stop_selected_language();				/* unset locale */
+#endif
+	DeleteHash(&TheSession->summ);
+	DeleteHash(&TheSession->urlstrings);
+	DeleteHash(&TheSession->vars);
+	FreeStrBuf(&TheSession->WBuf);
+	FreeStrBuf(&TheSession->HBuf);
+	
+	
 	pthread_mutex_unlock(&TheSession->SessionMutex);	/* unbind */
 
 	/* Free the request buffer */
-bail:	while (req != NULL) {
-		hptr = req->next;
-		free(req);
-		req = hptr;
-	}
-
-	/* Free up any session-local substitution variables which
+	DeleteHash(&HTTPHeaders);
+	FreeStrBuf(&ReqLine);
+	FreeStrBuf(&ReqType);
+	FreeStrBuf(&Buf);
+	/*
+	 * Free up any session-local substitution variables which
 	 * were set during this transaction
 	 */
-	clear_local_substs();
+	
+	
+}
+
+void tmpl_nonce(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	wcsession *WCC = WC;
+	StrBufAppendPrintf(Target, "%ld",
+			   (WCC != NULL)? WCC->nonce:0);		   
+}
+
+void 
+InitModule_CONTEXT
+(void)
+{
+	RegisterNamespace("NONCE", 0, 0, tmpl_nonce, 0);
 }