sneaking up on that bug like a cat prowling in the jungle

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 0ed08dc10090ad9fb3bf79444c33c46c497b8c59..3b1f30ae3969d7cb80d1a7fc654b7d5e9e6bf2d0 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -504,19 +504,18 @@ void context_loop(ParsedHttpHdrs *Hdr)
        isbogus = ReadHTTPRequest(Hdr);
 
        Hdr->HR.dav_depth = 32767; /* TODO: find a general way to have non-0 defaults */
-       if (!isbogus)
+
+       if (!isbogus) {
                isbogus = AnalyseHeaders(Hdr);
+       }
 
-       if ((isbogus) ||
-           ((Hdr->HR.Handler != NULL) &&
-            ((Hdr->HR.Handler->Flags & BOGUS) != 0)))
-       {
+       if (    (isbogus)
+               || ((Hdr->HR.Handler != NULL)
+               && ((Hdr->HR.Handler->Flags & BOGUS) != 0))
+       ) {
                wcsession *Bogus;
-
                Bogus = CreateSession(0, 1, NULL, Hdr, NULL);
-
                do_404();
-
                syslog(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,

diff --git a/webcit/webcit.c b/webcit/webcit.c
index d988ea8b9987b802d6136a58cc7434581af5eaf7..6d789dc4879b990725c30b5df3882f15eb085733 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -347,13 +347,16 @@ void authorization_required(void)
        wc_printf("<h1>");
        wc_printf(_("Authorization Required"));
        wc_printf("</h1>\r\n");
-       
 
-       if (WCC->ImportantMsg != NULL)
+       if (WCC->ImportantMsg != NULL) {
                message = ChrPtr(WCC->ImportantMsg);
+       }
 
-       wc_printf(_("The resource you requested requires a valid username and password. "
-               "You could not be logged in: %s\n"), message);
+       wc_printf(
+               _("The resource you requested requires a valid username and password. "
+               "You could not be logged in: %s\n"),
+               message
+       );
        wDumpContent(0);
        end_webcit_session();
 }