]> code.citadel.org Git - citadel.git/blobdiff - webcit/webcit.c
* add logging if auth-basic session connecting fails with weird conditions
[citadel.git] / webcit / webcit.c
index 1f9fd521d1db58d8e4b8a4bd0bc4475dfa42eda5..869793a2c2ace1b4c524d9d388b99c2e3c2dbaef 100644 (file)
@@ -241,6 +241,7 @@ void http_redirect(const char *whichpage) {
        hprintf("Location: %s\r\n", whichpage);
        hprintf("URI: %s\r\n", whichpage);
        hprintf("Content-type: text/html; charset=utf-8\r\n");
+       begin_burst();
        wprintf("<html><body>");
        wprintf("Go <a href=\"%s\">here</A>.", whichpage);
        wprintf("</body></html>\n");
@@ -379,6 +380,7 @@ void authorization_required(void)
        );
        hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode));
        hprintf("Content-Type: text/html\r\n");
+       begin_burst();
        wprintf("<h1>");
        wprintf(_("Authorization Required"));
        wprintf("</h1>\r\n");
@@ -392,7 +394,7 @@ void authorization_required(void)
        wprintf(_("The resource you requested requires a valid username and password. "
                "You could not be logged in: %s\n"), message);
        wDumpContent(0);
-       
+       end_webcit_session();
 }
 
 /*
@@ -549,6 +551,9 @@ void ReadPostData(void)
                        WCC->Hdr->HR.ContentLength + 
                        body_start;
                mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
+       } else if (WCC->Hdr->HR.ContentLength > 0) {
+               WCC->upload = content;
+               content = NULL;
        }
        FreeStrBuf(&content);
 }
@@ -598,6 +603,7 @@ void session_loop(void)
                        lprintf(9, "Ignoring request with mismatched nonce.\n");
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
                        hprintf("Content-Type: text/plain\r\n\r\n");
+                       begin_burst();
                        wprintf("Security check failed.\r\n");
                        end_burst();
                        goto SKIP_ALL_THIS_CRAP;
@@ -790,13 +796,13 @@ InitModule_WEBCIT
        RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, CTX_NONE);
        RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, CTX_NONE);
 
-       snprintf(dir, SIZ, "%s/static.local/webcit.css", static_local_dir);
+       snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);
        if (!access(dir, R_OK)) {
                lprintf(9, "Using local Stylesheet [%s]\n", dir);
                csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\">"));
        }
        else
-               lprintf(9, "Didn't find site local Stylesheet [%s]\n", dir);
+               lprintf(9, "No Site-local Stylesheet [%s] installed. \n", dir);
 
 }
 
@@ -833,7 +839,7 @@ SessionDetachModule_WEBCIT
 {
        DeleteHash(&sess->Hdr->urlstrings);// TODO?
        if (sess->upload_length > 0) {
-               free(sess->upload);
+               FreeStrBuf(&sess->upload);
                sess->upload_length = 0;
        }
        FreeStrBuf(&sess->trailing_javascript);