X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=f02a619913123c375a81c599d29b6e5dd17896cf;hb=HEAD;hp=2a6fe162dd72331f10b86e0affc86884be104caa;hpb=458432bb2cc89c16b94cf49120d92388b8e005a1;p=citadel.git

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 2a6fe162d..bb0c1cb97 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -16,7 +16,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "modules_init.h"
 
 /* Only one thread may manipulate SessionList at a time... */
@@ -24,7 +24,6 @@ pthread_mutex_t SessionListMutex;
 
 wcsession *SessionList = NULL;	/* Linked list of all webcit sessions */
 
-pthread_key_t MyConKey;         /* TSD key for MySession() */
 HashList *HttpReqTypes = NULL;
 HashList *HttpHeaderHandler = NULL;
 extern HashList *HandlerHash;
@@ -32,6 +31,7 @@ extern HashList *HandlerHash;
 /* the following two values start at 1 because the initial parent thread counts as one. */
 int num_threads_existing = 1;		/* Number of worker threads which exist. */
 int num_threads_executing = 1;		/* Number of worker threads currently executing. */
+int verbose=0;
 
 extern void session_loop(void);
 void spawn_another_worker_thread(void);
@@ -177,7 +177,8 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
 				&& (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password)))
 				&& (sptr->killthis == 0)
 			) {
-				syslog(LOG_DEBUG, "Matched a session with the same http-auth");
+				if (verbose)
+					syslog(LOG_DEBUG, "Matched a session with the same http-auth");
 				TheSession = sptr;
 			}
 			break;
@@ -186,14 +187,16 @@ wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t
 			if (	(Hdr->HR.desired_session != 0)
 				&& (sptr->wc_session == Hdr->HR.desired_session)
 			) {
-				syslog(LOG_DEBUG, "Matched a session with the same cookie");
+				if (verbose)
+					syslog(LOG_DEBUG, "Matched a session with the same cookie");
 				TheSession = sptr;
 			}
 			break;			     
 		case NO_AUTH:
 			/* Any unbound session is a candidate */
 			if ( (sptr->wc_session == 0) && (sptr->inuse == 0) ) {
-				syslog(LOG_DEBUG, "Reusing an unbound session");
+				if (verbose)
+					syslog(LOG_DEBUG, "Reusing an unbound session");
 				TheSession = sptr;
 			}
 			break;
@@ -345,7 +348,7 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
 		StrBuf *NewLine = NewStrBuf();
 		Hdr->HR.DontNeedAuth = 1;
 		StrBufAppendPrintf(NewLine, "GET /landing?go=%s?failvisibly=1 HTTP/1.0", ChrPtr(Buf));
-		syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
+		if (verbose) syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
 		return_value = ReadHttpSubject(Hdr, NewLine, Buf);
 		FreeStrBuf(&NewLine);
 		return return_value;
@@ -354,8 +357,7 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
 	return 0;
 }
 
-int AnalyseHeaders(ParsedHttpHdrs *Hdr)
-{
+int AnalyseHeaders(ParsedHttpHdrs *Hdr) {
 	OneHttpHeader *pHdr;
 	void *vHdr;
 	long HKLen;
@@ -373,13 +375,11 @@ int AnalyseHeaders(ParsedHttpHdrs *Hdr)
 	return 0;
 }
 
-/*const char *nix(void *vptr) {return ChrPtr( (StrBuf*)vptr);}*/
 
 /*
  * Read in the request
  */
-int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
-{
+int ReadHTTPRequest(ParsedHttpHdrs *Hdr) {
 	const char *pch, *pchs, *pche;
 	OneHttpHeader *pHdr;
 	StrBuf *Line, *LastLine, *HeaderName;
@@ -393,7 +393,11 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 		nLine ++;
 		Line = NewStrBufPlain(NULL, SIZ / 4);
 
-		if (ClientGetLine(Hdr, Line) < 0) return 1;
+		if (ClientGetLine(Hdr, Line) < 0) {
+			FreeStrBuf(&Line);
+			isbogus = 1;
+			break;
+		}
 
 		if (StrLength(Line) == 0) {
 			FreeStrBuf(&Line);
@@ -405,19 +409,21 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 			memset(pHdr, 0, sizeof(OneHttpHeader));
 			pHdr->Val = Line;
 			Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
-			syslog(LOG_DEBUG, "%s", ChrPtr(Line));
+			if (verbose || strstr(ChrPtr(Line), "sslg") == NULL) {
+				syslog(LOG_DEBUG, "%s", ChrPtr(Line));
+			}
 			isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
 			if (isbogus) break;
 			continue;
 		}
 
 		/* Do we need to Unfold? */
-		if ((LastLine != NULL) && 
-		    (isspace(*ChrPtr(Line)))) {
+		if ((LastLine != NULL) && (isspace(*ChrPtr(Line)))) {
 			pch = pchs = ChrPtr(Line);
 			pche = pchs + StrLength(Line);
-			while (isspace(*pch) && (pch < pche))
+			while (isspace(*pch) && (pch < pche)) {
 				pch ++;
+			}
 			StrBufCutLeft(Line, pch - pchs);
 			StrBufAppendBuf(LastLine, Line, 0);
 
@@ -425,26 +431,24 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 			continue;
 		}
 
-		StrBufSanitizeAscii(Line, '§');
+		StrBufSanitizeAscii(Line, (char)0xa7);
 		StrBufExtract_token(HeaderName, Line, 0, ':');
 
 		pchs = ChrPtr(Line);
 		pche = pchs + StrLength(Line);
 		pch = pchs + StrLength(HeaderName) + 1;
 		pche = pchs + StrLength(Line);
-		while ((pch < pche) && isspace(*pch))
+		while ((pch < pche) && isspace(*pch)) {
 			pch ++;
+		}
 		StrBufCutLeft(Line, pch - pchs);
-
 		StrBufUpCase(HeaderName);
 
 		pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
 		memset(pHdr, 0, sizeof(OneHttpHeader));
 		pHdr->Val = Line;
 
-		if (GetHash(HttpHeaderHandler, SKEY(HeaderName), &vF) &&
-		    (vF != NULL))
-		{
+		if (GetHash(HttpHeaderHandler, SKEY(HeaderName), &vF) && (vF != NULL)) {
 			OneHttpHeader *FHdr = (OneHttpHeader*) vF;
 			pHdr->H = FHdr->H;
 			pHdr->HaveEvaluator = 1;
@@ -487,8 +491,7 @@ void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len)
  * function returns, the worker thread is then free to handle another
  * transaction.
  */
-void context_loop(ParsedHttpHdrs *Hdr)
-{
+void context_loop(ParsedHttpHdrs *Hdr) {
 	int isbogus = 0;
 	wcsession *TheSession;
 	struct timeval tx_start;
@@ -527,8 +530,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
 		return;
 	}
 
-	if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
-	{
+	if ((Hdr->HR.Handler != NULL) && ((Hdr->HR.Handler->Flags & ISSTATIC) != 0)) {
 		wcsession *Static;
 		Static = CreateSession(0, 1, NULL, Hdr, NULL);
 		
@@ -537,11 +539,12 @@ void context_loop(ParsedHttpHdrs *Hdr)
 		/* How long did this transaction take? */
 		gettimeofday(&tx_finish, NULL);
 		
-		syslog(LOG_DEBUG, "HTTP: 200 [%ld.%06ld] %s %s",
-			((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
-			((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
-			ReqStrs[Hdr->HR.eReqType],
-			ChrPtr(Hdr->this_page)
+		if (verbose)
+			syslog(LOG_DEBUG, "HTTP: 200 [%ld.%06ld] %s %s",
+			       ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+			       ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+			       ReqStrs[Hdr->HR.eReqType],
+			       ChrPtr(Hdr->this_page)
 		);
 		session_detach_modules(Static);
 		session_destroy_modules(&Static);
@@ -597,6 +600,7 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	pthread_setspecific(MyConKey, (void *)TheSession);
 	
 	TheSession->inuse = 1;				/* mark the session as bound */
+	TheSession->isFailure = 0;                      /* reset evntually existing error flags */
 	TheSession->lastreq = now;			/* log */
 	TheSession->Hdr = Hdr;
 
@@ -604,7 +608,9 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	 * If a language was requested via a cookie, select that language now.
 	 */
 	if (StrLength(Hdr->c_language) > 0) {
-		syslog(LOG_DEBUG, "Session cookie requests language '%s'", ChrPtr(Hdr->c_language));
+		if (verbose) {
+			syslog(LOG_DEBUG, "Session cookie requests language '%s'", ChrPtr(Hdr->c_language));
+		}
 		set_selected_language(ChrPtr(Hdr->c_language));
 		go_selected_language();
 	}
@@ -618,13 +624,14 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	/* How long did this transaction take? */
 	gettimeofday(&tx_finish, NULL);
 
-	syslog(LOG_INFO, "HTTP: 200 [%ld.%06ld] %s %s",
-		((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
-		((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
-		ReqStrs[Hdr->HR.eReqType],
-		ChrPtr(Hdr->this_page)
-	);
-
+	if (verbose || strstr(ChrPtr(Hdr->this_page), "sslg") == NULL) {
+		syslog(LOG_INFO, "HTTP: 200 [%ld.%06ld] %s %s",
+		       ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+		       ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+		       ReqStrs[Hdr->HR.eReqType],
+		       ChrPtr(Hdr->this_page)
+			);
+	}
 	session_detach_modules(TheSession);
 
 	/* If *this* very transaction did not explicitly specify a session cookie,