Remove whitespace at end of canonicalized header lines

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index bf3ac7def2171edb0ee1a074978670aaa492ff9e..bb0c1cb97a2fd944a2fbe599a44df771288aacbc 100644 (file)
--- 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;
@@ -358,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;
@@ -377,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;
@@ -397,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);
@@ -409,20 +409,21 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
                        memset(pHdr, 0, sizeof(OneHttpHeader));
                        pHdr->Val = Line;
                        Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
-                       if (verbose || strstr(ChrPtr(Line), "sslg") == NULL)
+                       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);
 
@@ -437,19 +438,17 @@ int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
                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;
@@ -492,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;
@@ -532,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);
                
@@ -603,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;
 
@@ -610,8 +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) {
-               if (verbose)
+               if (verbose) {
                        syslog(LOG_DEBUG, "Session cookie requests language '%s'", ChrPtr(Hdr->c_language));
+               }
                set_selected_language(ChrPtr(Hdr->c_language));
                go_selected_language();
        }