X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcontext_loop.c;h=bf3ac7def2171edb0ee1a074978670aaa492ff9e;hb=0bb85075081ecab7a189484af2438116982a3030;hp=5320e56fc58dfb8f1a351ea83103e5d7265256e3;hpb=156d3eaa1b5d85cb70a79046bd874ab832df6ff1;p=citadel.git

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 5320e56fc..bf3ac7def 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -32,6 +32,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 +178,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 +188,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;
@@ -344,8 +348,8 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
 		int return_value;
 		StrBuf *NewLine = NewStrBuf();
 		Hdr->HR.DontNeedAuth = 1;
-		StrBufAppendPrintf(NewLine, "GET /landing?go=%s HTTP/1.0", ChrPtr(Buf));
-		syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
+		StrBufAppendPrintf(NewLine, "GET /landing?go=%s?failvisibly=1 HTTP/1.0", ChrPtr(Buf));
+		if (verbose) syslog(LOG_DEBUG, "Replacing with: %s", ChrPtr(NewLine));
 		return_value = ReadHttpSubject(Hdr, NewLine, Buf);
 		FreeStrBuf(&NewLine);
 		return return_value;
@@ -405,7 +409,8 @@ 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;
@@ -425,7 +430,7 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 			continue;
 		}
 
-		StrBufSanitizeAscii(Line, '§');
+		StrBufSanitizeAscii(Line, (char)0xa7);
 		StrBufExtract_token(HeaderName, Line, 0, ':');
 
 		pchs = ChrPtr(Line);
@@ -537,11 +542,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);
@@ -604,7 +610,8 @@ 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 +625,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,
@@ -633,9 +641,9 @@ void context_loop(ParsedHttpHdrs *Hdr)
 	 * table from getting bombarded with new sessions when, for example, a web
 	 * spider crawls the site without using cookies.
 	 */
-	if ((session_may_be_reused) && (!WC->logged_in)) {
-		WC->wc_session = 0;			/* flag as available for re-use */
-		TheSession->selected_language = 0;	/* clear any non-default language setting */
+	if ((session_may_be_reused) && (!TheSession->logged_in)) {
+		TheSession->wc_session = 0;		/* flag as available for re-use */
+		TheSession->selected_language = -1;	/* clear any non-default language setting */
 	}
 
 	TheSession->Hdr = NULL;
@@ -714,6 +722,31 @@ void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
 		hdr->HR.gzip_ok = 1;
 	}
 }
+
+void Header_HandleContentRange(StrBuf *Line, ParsedHttpHdrs *hdr)
+{
+	const char *PRange = ChrPtr(Line);
+
+	while ((*PRange != '=') && (*PRange != '\0'))
+		PRange ++;
+	if (*PRange == '=')
+		PRange ++;
+	if ((*PRange == '\0'))
+		return;
+	hdr->HaveRange = 1;
+	hdr->RangeStart = atol(PRange);
+
+	while (isdigit(*PRange))
+		PRange++;
+
+	if (*PRange == '-')
+		PRange ++;
+	if ((*PRange == '\0'))
+		hdr->RangeTil = -1;
+	else
+		hdr->RangeTil = atol(PRange);
+}
+
 const char *ReqStrs[eNONE] = {
 	"GET",
 	"POST",
@@ -798,6 +831,7 @@ void
 InitModule_CONTEXT
 (void)
 {
+	RegisterHeaderHandler(HKEY("RANGE"), Header_HandleContentRange);
 	RegisterHeaderHandler(HKEY("CONTENT-LENGTH"), Header_HandleContentLength);
 	RegisterHeaderHandler(HKEY("CONTENT-TYPE"), Header_HandleContentType);
 	RegisterHeaderHandler(HKEY("X-FORWARDED-HOST"), Header_HandleXFFHost); /* Apache way... */