* set an application specific prefered Buffer size in places where debugging shows...

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index f3f91033700ca9f841349aa33f399695bf22d00d..f18493333e815883f94733eec090cd6b69580514 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -135,7 +135,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
                                PACKAGE_STRING);
        }
 
-       if (cache) {
+       if (cache > 0) {
                char httpTomorow[128];
 
                http_datestring(httpTomorow, sizeof httpTomorow, 
@@ -156,16 +156,23 @@ void output_headers(      int do_httpheaders,     /* 1 = output HTTP headers
                );
        }
 
-       stuff_to_cookie(cookie, 1024, 
-                       WCC->wc_session, WCC->wc_username,
-                       WCC->wc_password, WCC->wc_roomname);
+       if (cache < 2) {
 
-       if (unset_cookies) {
-               hprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
-       } else {
-               hprintf("Set-cookie: webcit=%s; path=/\r\n", cookie);
-               if (server_cookie != NULL) {
-                       hprintf("%s\n", server_cookie);
+               stuff_to_cookie(cookie, 1024, 
+                               WCC->wc_session,
+                               WCC->wc_username,
+                               WCC->wc_password,
+                               WCC->wc_roomname,
+                               get_selected_language()
+                       );
+               
+               if (unset_cookies) {
+                       hprintf("Set-cookie: webcit=%s; path=/\r\n", unset);
+               } else {
+                       hprintf("Set-cookie: webcit=%s; path=/\r\n", cookie);
+                       if (server_cookie != NULL) {
+                               hprintf("%s\n", server_cookie);
+                       }
                }
        }
 
@@ -250,7 +257,7 @@ void http_transmit_thing(const char *content_type,
 #ifndef TECH_PREVIEW
        lprintf(9, "http_transmit_thing(%s)%s\n",
                content_type,
-               (is_static ? " (static)" : "")
+               ((is_static > 0) ? " (static)" : "")
        );
 #endif
        output_headers(0, 0, 0, 0, 0, is_static);
@@ -396,14 +403,6 @@ void end_ajax_response(void) {
         wDumpContent(0);
 }
 
-       /* If it's a "force 404" situation then display the error and bail. */
-void do_404(void)
-{
-       hprintf("HTTP/1.1 404 Not found\r\n");
-       hprintf("Content-Type: text/plain\r\n");
-       wprintf("Not found\r\n");
-       end_burst();
-}
 
 
 /*
@@ -507,13 +506,13 @@ void ReadPostData(void)
        wcsession *WCC = WC;
        StrBuf *content = NULL;
        
-       content = NewStrBuf();
+       content = NewStrBufPlain(NULL, WCC->Hdr->HR.ContentLength + 256);
 
        StrBufPrintf(content, 
                     "Content-type: %s\n"
                     "Content-length: %ld\n\n",
-                    ChrPtr(WCC->Hdr->ContentType), 
-                            WCC->Hdr->ContentLength);
+                    ChrPtr(WCC->Hdr->HR.ContentType), 
+                            WCC->Hdr->HR.ContentLength);
 /*
   hprintf("Content-type: %s\n"
   "Content-length: %d\n\n",
@@ -522,18 +521,16 @@ void ReadPostData(void)
        body_start = StrLength(content);
 
        /** Read the entire input data at once. */
-       client_read_to(&WCC->Hdr->http_sock, 
-                      content, 
-                      WCC->Hdr->ReadBuf, &WCC->Hdr->Pos,
-                      WCC->Hdr->ContentLength,
+       client_read_to(WCC->Hdr, content, 
+                      WCC->Hdr->HR.ContentLength,
                       SLEEPING);
        
-       if (!strncasecmp(ChrPtr(WCC->Hdr->ContentType), "application/x-www-form-urlencoded", 33)) {
+       if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "application/x-www-form-urlencoded", 33)) {
                StrBufCutLeft(content, body_start);
                ParseURLParams(content);
-       } else if (!strncasecmp(ChrPtr(WCC->Hdr->ContentType), "multipart", 9)) {
+       } else if (!strncasecmp(ChrPtr(WCC->Hdr->HR.ContentType), "multipart", 9)) {
                content_end = ChrPtr(content) + 
-                       WCC->Hdr->ContentLength + 
+                       WCC->Hdr->HR.ContentLength + 
                        body_start;
                mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
        }
@@ -568,10 +565,10 @@ void session_loop(void)
        WCC->is_mobile = 0;
        WCC->trailing_javascript = NewStrBuf();
        WCC->Hdr->nWildfireHeaders = 0;
-       if (WCC->Hdr->Handler != NULL)
-               Flags = WCC->Hdr->Handler->Flags; /* so we can temporarily add our own... */
+       if (WCC->Hdr->HR.Handler != NULL)
+               Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */
 
-       if (WCC->Hdr->ContentLength > 0) {
+       if (WCC->Hdr->HR.ContentLength > 0) {
                ReadPostData();
        }
 
@@ -629,9 +626,9 @@ void session_loop(void)
                }
        }
 
-       xhttp = (WCC->Hdr->eReqType != eGET) &&
-               (WCC->Hdr->eReqType != ePOST) &&
-               (WCC->Hdr->eReqType != eHEAD);
+       xhttp = (WCC->Hdr->HR.eReqType != eGET) &&
+               (WCC->Hdr->HR.eReqType != ePOST) &&
+               (WCC->Hdr->HR.eReqType != eHEAD);
 
        /*
         * If a 'gotofirst' parameter has been specified, attempt to goto that room
@@ -651,11 +648,12 @@ void session_loop(void)
         * supposed to be, and 'gotofirst' was not specified, then go there.
         */
        else if ( (StrLength(WCC->wc_roomname) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
+               int ret;
+
                lprintf(9, "We are in '%s' but cookie indicates '%s', going there...\n",
                        ChrPtr(WCC->wc_roomname),
                        ChrPtr(WCC->Hdr->c_roomname)
                );
-               int ret;
                ret = gotoroom(WCC->Hdr->c_roomname);   /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
                        lprintf(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d\n",
@@ -663,15 +661,15 @@ void session_loop(void)
                }
        }
 
-       if (WCC->Hdr->Handler != NULL) {
-               if (!WCC->logged_in && ((WCC->Hdr->Handler->Flags & ANONYMOUS) == 0)) {
+       if (WCC->Hdr->HR.Handler != NULL) {
+               if (!WCC->logged_in && ((WCC->Hdr->HR.Handler->Flags & ANONYMOUS) == 0)) {
                        display_login(NULL);
                }
                else {
-                       if ((WCC->Hdr->Handler->Flags & AJAX) != 0)
+                       if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
                                begin_ajax_response();
-                       WCC->Hdr->Handler->F();
-                       if ((WCC->Hdr->Handler->Flags & AJAX) != 0)
+                       WCC->Hdr->HR.Handler->F();
+                       if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
                                end_ajax_response();
                }
        }
@@ -684,13 +682,8 @@ void session_loop(void)
        }
 
 SKIP_ALL_THIS_CRAP:
-       if (WCC->SavePrefsToServer) {
-               save_preferences();
-               WCC->SavePrefsToServer = 0;
-       }
        FreeStrBuf(&Buf);
        fflush(stdout);
-       WCC->Hdr->http_host = NULL;
 }
 
 
@@ -755,14 +748,11 @@ InitModule_WEBCIT
 (void)
 {
        char dir[SIZ];
-       WebcitAddUrlHandler(HKEY("404"), do_404, ANONYMOUS|COOKIEUNNEEDED);
        WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
-
-
-       WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS);
        WebcitAddUrlHandler(HKEY("do_template"), url_do_template, ANONYMOUS);
        WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX|LOGCHATTY);
        WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0);
+       WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE);
 
        RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
        RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE);
@@ -802,8 +792,8 @@ SessionNewModule_WEBCIT
 (wcsession *sess)
 {
        sess->ImportantMsg = NewStrBuf();
-       sess->WBuf = NewStrBuf();
-       sess->HBuf = NewStrBuf();
+       sess->WBuf = NewStrBufPlain(NULL, SIZ * 4);
+       sess->HBuf = NewStrBufPlain(NULL, SIZ / 4);
 }
 
 void