* make the cookie failure page non-cacheable.
[citadel.git] / webcit / context_loop.c
index 93e7a5f824ee925aa1e66ee5c117c9f5ccac57cb..507ff9e767d1823d46139685ae09ce6403382267 100644 (file)
@@ -136,44 +136,86 @@ int GenerateSessionID(void)
        return ++seq;
 }
 
-
-/*
- * lingering_close() a`la Apache. see
- * http://www.apache.org/docs/misc/fin_wait_2.html for rationale
- */
-int lingering_close(int fd)
+wcsession *FindSession(wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
 {
-       char buf[SIZ];
-       int i;
-       fd_set set;
-       struct timeval tv, start;
+       wcsession  *sptr, *TheSession = NULL;   
+       
+       pthread_mutex_lock(ListMutex);
+       for (sptr = *wclist; 
+            ((sptr != NULL) && (TheSession == NULL)); 
+            sptr = sptr->next) {
+               
+               /** If HTTP-AUTH, look for a session with matching credentials */
+               switch (Hdr->HR.got_auth)
+               {
+               case AUTH_BASIC:
+                       if ( (Hdr->HR.SessionKey != sptr->SessionKey))
+                               continue;
+                       GetAuthBasic(Hdr);
+                       if ((!strcasecmp(ChrPtr(Hdr->c_username), ChrPtr(sptr->wc_username))) &&
+                           (!strcasecmp(ChrPtr(Hdr->c_password), ChrPtr(sptr->wc_password))) ) 
+                               TheSession = sptr;
+                       break;
+               case AUTH_COOKIE:
+                       /** If cookie-session, look for a session with matching session ID */
+                       if ( (Hdr->HR.desired_session != 0) && 
+                            (sptr->wc_session == Hdr->HR.desired_session)) 
+                               TheSession = sptr;
+                       break;                       
+               case NO_AUTH:
+                       break;
+               }
+       }
+       pthread_mutex_unlock(ListMutex);
+       return TheSession;
+}
 
-       gettimeofday(&start, NULL);
-       shutdown(fd, 1);
-       do {
-               do {
-                       gettimeofday(&tv, NULL);
-                       tv.tv_sec = SLEEPING - (tv.tv_sec - start.tv_sec);
-                       tv.tv_usec = start.tv_usec - tv.tv_usec;
-                       if (tv.tv_usec < 0) {
-                               tv.tv_sec--;
-                               tv.tv_usec += 1000000;
-                       }
-                       FD_ZERO(&set);
-                       FD_SET(fd, &set);
-                       i = select(fd + 1, &set, NULL, NULL, &tv);
-               } while (i == -1 && errno == EINTR);
+wcsession *CreateSession(int Lockable, wcsession **wclist, ParsedHttpHdrs *Hdr, pthread_mutex_t *ListMutex)
+{
+       wcsession *TheSession;
+       lprintf(3, "Creating a new session\n");
+       TheSession = (wcsession *)
+               malloc(sizeof(wcsession));
+       memset(TheSession, 0, sizeof(wcsession));
+       TheSession->Hdr = Hdr;
+       TheSession->SessionKey = Hdr->HR.SessionKey;
+       TheSession->serv_sock = (-1);
+       TheSession->chat_sock = (-1);
+       TheSession->is_mobile = -1;
 
-               if (i <= 0)
-                       break;
+       pthread_setspecific(MyConKey, (void *)TheSession);
+       
+       /* 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 (Hdr->HR.desired_session == 0) {
+               TheSession->wc_session = GenerateSessionID();
+       }
+       else {
+               TheSession->wc_session = Hdr->HR.desired_session;
+       }
 
-               i = read(fd, buf, sizeof buf);
-       } while (i != 0 && (i != -1 || errno == EINTR));
+       session_new_modules(TheSession);
 
-       return close(fd);
-}
+       if (Lockable) {
+               pthread_mutex_init(&TheSession->SessionMutex, NULL);
 
+               if (ListMutex != NULL)
+                       pthread_mutex_lock(ListMutex);
 
+               if (wclist != NULL) {
+                       TheSession->nonce = rand();
+                       TheSession->next = *wclist;
+                       *wclist = TheSession;
+               }
+               if (ListMutex != NULL)
+                       pthread_mutex_unlock(ListMutex);
+       }
+       return TheSession;
+}
 
 
 /**
@@ -211,75 +253,80 @@ int ReadHttpSubject(ParsedHttpHdrs *Hdr, StrBuf *Line, StrBuf *Buf)
        const char *Pos = NULL;
 
 
-       Hdr->ReqLine = Line;
+       Hdr->HR.ReqLine = Line;
        /* The requesttype... GET, POST... */
-       StrBufExtract_token(Buf, Hdr->ReqLine, 0, ' ');
+       StrBufExtract_token(Buf, Hdr->HR.ReqLine, 0, ' ');
        if (GetHash(HttpReqTypes, SKEY(Buf), &vLine) &&
            (vLine != NULL))
        {
-               Hdr->eReqType = *(long*)vLine;
+               Hdr->HR.eReqType = *(long*)vLine;
        }
        else {
-               Hdr->eReqType = eGET;
+               Hdr->HR.eReqType = eGET;
                return 1;
        }
-       StrBufCutLeft(Hdr->ReqLine, StrLength(Buf) + 1);
+       StrBufCutLeft(Hdr->HR.ReqLine, StrLength(Buf) + 1);
 
        /* the HTTP Version... */
-       StrBufExtract_token(Buf, Hdr->ReqLine, 1, ' ');
-       StrBufCutRight(Hdr->ReqLine, StrLength(Buf) + 1);
+       StrBufExtract_token(Buf, Hdr->HR.ReqLine, 1, ' ');
+       StrBufCutRight(Hdr->HR.ReqLine, StrLength(Buf) + 1);
        
        if (StrLength(Buf) == 0) {
-               Hdr->eReqType = eGET;
+               Hdr->HR.eReqType = eGET;
                return 1;
        }
 
-       Hdr->this_page = NewStrBufDup(Hdr->ReqLine);
+       StrBufAppendBuf(Hdr->this_page, Hdr->HR.ReqLine, 0);
        /* chop Filename / query arguments */
-       Args = strchr(ChrPtr(Hdr->ReqLine), '?');
+       Args = strchr(ChrPtr(Hdr->HR.ReqLine), '?');
        if (Args == NULL) /* whe're not that picky about params... TODO: this will spoil '&' in filenames.*/
-               Args = strchr(ChrPtr(Hdr->ReqLine), '&');
+               Args = strchr(ChrPtr(Hdr->HR.ReqLine), '&');
        if (Args != NULL) {
                Args ++; /* skip the ? */
-               Hdr->PlainArgs = NewStrBufPlain(
-                       Args, 
-                       StrLength(Hdr->ReqLine) -
-                       (Args - ChrPtr(Hdr->ReqLine)));
-               StrBufCutAt(Hdr->ReqLine, 0, Args - 1);
+               StrBufPlain(Hdr->PlainArgs, 
+                           Args, 
+                           StrLength(Hdr->HR.ReqLine) -
+                           (Args - ChrPtr(Hdr->HR.ReqLine)));
+               StrBufCutAt(Hdr->HR.ReqLine, 0, Args - 1);
        } /* don't parse them yet, maybe we don't even care... */
        
        /* now lookup what we are going to do with this... */
        /* skip first slash */
-       StrBufExtract_NextToken(Buf, Hdr->ReqLine, &Pos, '/');
+       StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/');
        do {
-               StrBufExtract_NextToken(Buf, Hdr->ReqLine, &Pos, '/');
+               StrBufExtract_NextToken(Buf, Hdr->HR.ReqLine, &Pos, '/');
 
                GetHash(HandlerHash, SKEY(Buf), &vHandler),
-               Hdr->Handler = (WebcitHandler*) vHandler;
-               if (Hdr->Handler == NULL)
+               Hdr->HR.Handler = (WebcitHandler*) vHandler;
+               if (Hdr->HR.Handler == NULL)
                        break;
                /*
                 * 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.
                 */
-               if ((Hdr->Handler->Flags & URLNAMESPACE) != 0)
+               if ((Hdr->HR.Handler->Flags & URLNAMESPACE) != 0)
                        continue;
                break;
        } while (1);
        /* remove the handlername from the URL */
        if (Pos != NULL) {
-               StrBufCutLeft(Hdr->ReqLine, 
-                             Pos - ChrPtr(Hdr->ReqLine));
+               StrBufCutLeft(Hdr->HR.ReqLine, 
+                             Pos - ChrPtr(Hdr->HR.ReqLine));
        }
 
-       if (Hdr->Handler != NULL) {
-               if ((Hdr->Handler->Flags & BOGUS) != 0)
+       if (Hdr->HR.Handler != NULL) {
+               if ((Hdr->HR.Handler->Flags & BOGUS) != 0)
                        return 1;
-               Hdr->DontNeedAuth = (Hdr->Handler->Flags & ISSTATIC) != 0;
+               Hdr->HR.DontNeedAuth = (
+                       ((Hdr->HR.Handler->Flags & ISSTATIC) != 0) ||
+                       ((Hdr->HR.Handler->Flags & ANONYMOUS) != 0)
+                       );
+       }
+       else {
+               Hdr->HR.DontNeedAuth = 1; /* Flat request? show him the login screen... */
        }
 
-       Hdr->HTTPHeaders = NewHash(1, NULL);
        return 0;
 }
 
@@ -307,7 +354,7 @@ int AnalyseHeaders(ParsedHttpHdrs *Hdr)
 /*
  * Read in the request
  */
-int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
+int ReadHTTPRequest (ParsedHttpHdrs *Hdr)
 {
        const char *pch, *pchs, *pche;
        OneHttpHeader *pHdr;
@@ -317,19 +364,23 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
        int isbogus = 0;
 
        HeaderName = NewStrBuf();
-       Hdr->ReadBuf = NewStrBuf();
        LastLine = NULL;
        do {
                nLine ++;
                Line = NewStrBuf();
 
-               if (ClientGetLine(&Hdr->http_sock, Line, Hdr->ReadBuf, &Hdr->Pos) < 0) return 1;
+               if (ClientGetLine(Hdr, Line) < 0) return 1;
 
                if (StrLength(Line) == 0) {
                        FreeStrBuf(&Line);
                        continue;
                }
                if (nLine == 1) {
+                       Hdr->HTTPHeaders = NewHash(1, NULL);
+                       pHdr = (OneHttpHeader*) malloc(sizeof(OneHttpHeader));
+                       memset(pHdr, 0, sizeof(OneHttpHeader));
+                       pHdr->Val = Line;
+                       Put(Hdr->HTTPHeaders, HKEY("GET /"), pHdr, DestroyHttpHeaderHandler);
                        lprintf(9, "%s\n", ChrPtr(Line));
                        isbogus = ReadHttpSubject(Hdr, Line, HeaderName);
                        if (isbogus) break;
@@ -382,7 +433,16 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
        return isbogus;
 }
 
+void OverrideRequest(ParsedHttpHdrs *Hdr, const char *Line, long len)
+{
+       StrBuf *Buf = NewStrBuf();
+
+       FlushStrBuf(Hdr->HR.ReqLine);
+       StrBufPlain(Hdr->HR.ReqLine, Line, len);
+       ReadHttpSubject(Hdr, Hdr->HR.ReqLine, Buf);
 
+       FreeStrBuf(&Buf);
+}
 
 /*
  * handle one request
@@ -397,181 +457,100 @@ int ReadHTTPRequset (ParsedHttpHdrs *Hdr)
  * function returns, the worker thread is then free to handle another
  * transaction.
  */
-void context_loop(int *sock)
+void context_loop(ParsedHttpHdrs *Hdr)
 {
-       ParsedHttpHdrs Hdr;
        int isbogus = 0;
-       wcsession *TheSession, *sptr;
+       wcsession *TheSession;
        struct timeval tx_start;
        struct timeval tx_finish;
        
        gettimeofday(&tx_start, NULL);          /* start a stopwatch for performance timing */
 
-       memset(&Hdr, 0, sizeof(ParsedHttpHdrs));
-       Hdr.eReqType = eGET;
-       Hdr.http_sock = *sock;
        /*
         * Find out what it is that the web browser is asking for
         */
-       isbogus = ReadHTTPRequset(&Hdr);
+       isbogus = ReadHTTPRequest(Hdr);
 
        if (!isbogus)
-               isbogus = AnalyseHeaders(&Hdr);
+               isbogus = AnalyseHeaders(Hdr);
 
        if ((isbogus) ||
-           ((Hdr.Handler != NULL) &&
-            ((Hdr.Handler->Flags & BOGUS) != 0)))
+           ((Hdr->HR.Handler != NULL) &&
+            ((Hdr->HR.Handler->Flags & BOGUS) != 0)))
        {
                wcsession *Bogus;
-               Bogus = (wcsession *)
-                       malloc(sizeof(wcsession));
-               memset(Bogus, 0, sizeof(wcsession));
-               pthread_setspecific(MyConKey, (void *)Bogus);
-               Bogus->Hdr = &Hdr;
-               Bogus->WBuf = NewStrBuf();
-               Bogus->HBuf = NewStrBuf();
-               session_new_modules(Bogus);
+
+               Bogus = CreateSession(0, NULL, Hdr, NULL);
+
                do_404();
+
+               lprintf(9, "HTTP: 404 [%ld.%06ld] %s %s \n",
+                       ((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(Bogus);
-               http_destroy_modules(&Hdr);
                session_destroy_modules(&Bogus);
                return;
        }
 
-       if ((Hdr.Handler != NULL) && 
-           ((Hdr.Handler->Flags & ISSTATIC) != 0))
+       if ((Hdr->HR.Handler != NULL) && 
+           ((Hdr->HR.Handler->Flags & ISSTATIC) != 0))
        {
                wcsession *Static;
-
-               Static = (wcsession *)
-                       malloc(sizeof(wcsession));
-               memset(Static, 0, sizeof(wcsession));
-               pthread_setspecific(MyConKey, (void *)Static);
-               Static->Hdr = &Hdr;
-               Static->WBuf = NewStrBuf();
-               Static->HBuf = NewStrBuf();
-               Static->serv_sock = (-1);
-               Static->chat_sock = (-1);
-               Static->is_mobile = -1;
-               session_new_modules(Static);
+               Static = CreateSession(0, NULL, Hdr, NULL);
                
-               Hdr.Handler->F();
+               Hdr->HR.Handler->F();
 
                /* How long did this transaction take? */
                gettimeofday(&tx_finish, NULL);
                
-               lprintf(9, "Transaction [%s] completed in %ld.%06ld seconds.\n",
-                       ChrPtr(Hdr.this_page),
-                       ((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
-                       );
-
+#ifdef TECH_PREVIEW
+               if ((Hdr->HR.Handler != NULL) ||
+                   ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
+#endif
+                       lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
+                               ((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);
-               http_destroy_modules(&Hdr);
                session_destroy_modules(&Static);
                return;
        }
 
-       if (Hdr.got_auth == AUTH_BASIC) 
-               CheckAuthBasic(&Hdr);
+       if (Hdr->HR.got_auth == AUTH_BASIC) 
+               CheckAuthBasic(Hdr);
 
-/*
-TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
-*/
 
 /*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
 
-
-       /* 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\n", ReqStrs[Hdr.eReqType], ChrPtr(ReqLine));
-#ifdef TECH_PREVIEW
-       }
-#endif
-
-*/
-
        /**
         * See if there's an existing session open with the desired ID or user/pass
         */
        TheSession = NULL;
 
        if (TheSession == NULL) {
-               pthread_mutex_lock(&SessionListMutex);
-               for (sptr = SessionList; 
-                    ((sptr != NULL) && (TheSession == NULL)); 
-                     sptr = sptr->next) {
-
-                       /** If HTTP-AUTH, look for a session with matching credentials */
-                       switch (Hdr.got_auth)
-                       {
-                       case AUTH_BASIC:
-                               if ( (Hdr.SessionKey != sptr->SessionKey))
-                                       continue;
-                               GetAuthBasic(&Hdr);
-                               if ((!strcasecmp(ChrPtr(Hdr.c_username), ChrPtr(sptr->wc_username))) &&
-                                   (!strcasecmp(ChrPtr(Hdr.c_password), ChrPtr(sptr->wc_password))) ) 
-                                       TheSession = sptr;
-                               break;
-                       case AUTH_COOKIE:
-                       /** If cookie-session, look for a session with matching session ID */
-                               if ( (Hdr.desired_session != 0) && 
-                                    (sptr->wc_session == Hdr.desired_session)) 
-                                       TheSession = sptr;
-                               break;                       
-                       case NO_AUTH:
-                            break;
-                       }
-               }
-               pthread_mutex_unlock(&SessionListMutex);
+               TheSession = FindSession(&SessionList, Hdr, &SessionListMutex);
        }
 
        /**
         * Create a new session if we have to
         */
        if (TheSession == NULL) {
-               lprintf(3, "Creating a new session\n");
-               TheSession = (wcsession *)
-                       malloc(sizeof(wcsession));
-               memset(TheSession, 0, sizeof(wcsession));
-               TheSession->Hdr = &Hdr;
-               TheSession->SessionKey = Hdr.SessionKey;
-               TheSession->serv_sock = (-1);
-               TheSession->chat_sock = (-1);
-       
-               /* 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 (Hdr.desired_session == 0) {
-                       TheSession->wc_session = GenerateSessionID();
-               }
-               else {
-                       TheSession->wc_session = Hdr.desired_session;
-               }
+               TheSession = CreateSession(1, &SessionList, Hdr, &SessionListMutex);
 
-               pthread_setspecific(MyConKey, (void *)TheSession);
-               session_new_modules(TheSession);
-
-               pthread_mutex_init(&TheSession->SessionMutex, NULL);
-               pthread_mutex_lock(&SessionListMutex);
-               TheSession->nonce = rand();
-               TheSession->next = SessionList;
-               TheSession->is_mobile = -1;
-               SessionList = TheSession;
-               pthread_mutex_unlock(&SessionListMutex);
-
-               if (StrLength(Hdr.c_language) > 0) {
-                       lprintf(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr.c_language));
-                       set_selected_language(ChrPtr(Hdr.c_language));
+               if ((StrLength(Hdr->c_username) == 0) &&
+                   (!Hdr->HR.DontNeedAuth)) {
+                       OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0"));
+                       Hdr->HR.prohibit_caching = 1;
+               }
+               
+               if (StrLength(Hdr->c_language) > 0) {
+                       lprintf(9, "Session cookie requests language '%s'\n", ChrPtr(Hdr->c_language));
+                       set_selected_language(ChrPtr(Hdr->c_language));
                        go_selected_language();
                }
        }
@@ -588,7 +567,7 @@ TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
        pthread_setspecific(MyConKey, (void *)TheSession);
        
        TheSession->lastreq = time(NULL);                       /* log */
-       TheSession->Hdr = &Hdr;
+       TheSession->Hdr = Hdr;
 
        session_attach_modules(TheSession);
        session_loop();                         /* do transaction */
@@ -597,18 +576,22 @@ TODO    HKEY("/static/nocookies.html?force_close_session=yes"));
        /* How long did this transaction take? */
        gettimeofday(&tx_finish, NULL);
        
-       lprintf(9, "Transaction [%s] completed in %ld.%06ld seconds.\n",
-               ChrPtr(Hdr.this_page),
-               ((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
-       );
+
+#ifdef TECH_PREVIEW
+       if ((Hdr->HR.Handler != NULL) &&
+           ((Hdr->HR.Handler->Flags & LOGCHATTY) == 0))
+#endif
+               lprintf(9, "HTTP: 200 [%ld.%06ld] %s %s \n",
+                       ((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);
 
        TheSession->Hdr = NULL;
        pthread_mutex_unlock(&TheSession->SessionMutex);        /* unbind */
-
-       http_destroy_modules(&Hdr);
 }
 
 void tmplput_nonce(StrBuf *Target, WCTemplputParams *TP)
@@ -630,17 +613,17 @@ void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
 
 void Header_HandleContentLength(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
-       hdr->ContentLength = StrToi(Line);
+       hdr->HR.ContentLength = StrToi(Line);
 }
 
 void Header_HandleContentType(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
-       hdr->ContentType = Line;
+       hdr->HR.ContentType = Line;
 }
 
 void Header_HandleUserAgent(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
-       hdr->user_agent = Line;
+       hdr->HR.user_agent = Line;
 #ifdef TECH_PREVIEW
 /* TODO: do this later on session creating
        if ((WCC->is_mobile < 0) && is_mobile_ua(&buf[12])) {                   
@@ -656,32 +639,32 @@ void Header_HandleUserAgent(StrBuf *Line, ParsedHttpHdrs *hdr)
 
 void Header_HandleHost(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
-       if ((follow_xff) && (hdr->http_host != NULL))
+       if ((follow_xff) && (hdr->HR.http_host != NULL))
                return;
        else
-               hdr->http_host = Line;
+               hdr->HR.http_host = Line;
 }
 
 void Header_HandleXFFHost(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
        if (follow_xff)
-               hdr->http_host = Line;
+               hdr->HR.http_host = Line;
 }
 
 
 void Header_HandleXFF(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
-       hdr->browser_host = Line;
+       hdr->HR.browser_host = Line;
 
-       while (StrBufNum_tokens(hdr->browser_host, ',') > 1) {
-               StrBufRemove_token(hdr->browser_host, 0, ',');
+       while (StrBufNum_tokens(hdr->HR.browser_host, ',') > 1) {
+               StrBufRemove_token(hdr->HR.browser_host, 0, ',');
        }
-       StrBufTrim(hdr->browser_host);
+       StrBufTrim(hdr->HR.browser_host);
 }
 
 void Header_HandleIfModSince(StrBuf *Line, ParsedHttpHdrs *hdr)
 {
-       hdr->if_modified_since = httpdate_to_timestamp(Line);
+       hdr->HR.if_modified_since = httpdate_to_timestamp(Line);
 }
 
 void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
@@ -690,7 +673,7 @@ void Header_HandleAcceptEncoding(StrBuf *Line, ParsedHttpHdrs *hdr)
         * Can we compress?
         */
        if (strstr(&ChrPtr(Line)[16], "gzip")) {
-               hdr->gzip_ok = 1;
+               hdr->HR.gzip_ok = 1;
        }
 }
 const char *ReqStrs[eNONE] = {
@@ -799,15 +782,33 @@ InitModule_CONTEXT
 }
        
 
+void 
+HttpNewModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+       httpreq->PlainArgs = NewStrBuf();
+       httpreq->this_page = NewStrBuf();
+}
+
+void 
+HttpDetachModule_CONTEXT
+(ParsedHttpHdrs *httpreq)
+{
+       FlushStrBuf(httpreq->PlainArgs);
+       FlushStrBuf(httpreq->this_page);
+       FlushStrBuf(httpreq->PlainArgs);
+       DeleteHash(&httpreq->HTTPHeaders);
+       memset(&httpreq->HR, 0, sizeof(HdrRefs));
+}
 
 void 
 HttpDestroyModule_CONTEXT
 (ParsedHttpHdrs *httpreq)
 {
-       FreeStrBuf(&httpreq->ReqLine);
-       FreeStrBuf(&httpreq->ReadBuf);
+       FreeStrBuf(&httpreq->this_page);
        FreeStrBuf(&httpreq->PlainArgs);
        FreeStrBuf(&httpreq->this_page);
+       FreeStrBuf(&httpreq->PlainArgs);
        DeleteHash(&httpreq->HTTPHeaders);
 
 }