* temporary solution to our ser_readln migration: have a buffer on the session, read...

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index e2697f290b1e43c781efc815b3ebdb28f1a7702e..39a85d5c94bd2392533d88849664257b2f91d12e 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -52,6 +52,9 @@ void DestroySession(wcsession **sessions_to_kill)
        FreeStrBuf(&((*sessions_to_kill)->wc_roomname));
        FreeStrBuf(&((*sessions_to_kill)->httpauth_user));
        FreeStrBuf(&((*sessions_to_kill)->httpauth_pass));
+       FreeStrBuf(&((*sessions_to_kill)->ImportantMsg));
+       FreeStrBuf(&((*sessions_to_kill)->cs_inet_email));
+       FreeStrBuf(&((*sessions_to_kill)->MigrateReadLineBuf));
        free((*sessions_to_kill));
        (*sessions_to_kill) = NULL;
 }
@@ -329,10 +332,8 @@ void context_loop(int *sock)
                LastLine = Line;
        } while (LineLen > 0);
        FreeStrBuf(&HeaderName);
-       /* finish linebuffered fast reading, cut the read part: */
-       StrBufCutLeft(Buf, Pos - ChrPtr(Buf));
 
-       dbg_PrintHash(HTTPHeaders, nix, NULL); 
+/*     dbg_PrintHash(HTTPHeaders, nix, NULL);  */
 
 
        /*
@@ -516,6 +517,9 @@ void context_loop(int *sock)
                }
                else TheSession->httpauth_pass = NewStrBufPlain(httpauth_user, -1);
 
+               if (TheSession->MigrateReadLineBuf != NULL)
+                       FlushStrBuf(TheSession->MigrateReadLineBuf);
+               else TheSession->MigrateReadLineBuf = NewStrBuf();
                TheSession->CLineBuf = NewStrBuf();
                TheSession->hash_prefs = NewHash(1,NULL);       /* Get a hash table for the user preferences */
                pthread_mutex_init(&TheSession->SessionMutex, NULL);
@@ -539,6 +543,8 @@ void context_loop(int *sock)
        pthread_mutex_lock(&TheSession->SessionMutex);          /* bind */
        pthread_setspecific(MyConKey, (void *)TheSession);
        
+       if (TheSession->ImportantMsg == NULL)
+               TheSession->ImportantMsg = NewStrBuf();
        TheSession->urlstrings = NewHash(1,NULL);
        TheSession->vars = NewHash(1,NULL);
        TheSession->http_sock = *sock;
@@ -550,7 +556,7 @@ void context_loop(int *sock)
        }
        go_selected_language();                                 /* set locale */
 #endif
-       session_loop(HTTPHeaders, ReqLine, ReqType, Buf);                               /* do transaction */
+       session_loop(HTTPHeaders, ReqLine, ReqType, Buf, &Pos);                         /* do transaction */
 #ifdef ENABLE_NLS
        stop_selected_language();                               /* unset locale */
 #endif