From f7b538d716fc80c12ab49d3ca8c4eb48a5c51eb2 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 17 Nov 2011 12:54:59 -0500 Subject: [PATCH] sneaking up on that bug like a cat prowling in the jungle --- webcit/context_loop.c | 15 +++++++-------- webcit/webcit.c | 11 +++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/webcit/context_loop.c b/webcit/context_loop.c index 0ed08dc10..3b1f30ae3 100644 --- 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 d988ea8b9..6d789dc48 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -347,13 +347,16 @@ void authorization_required(void) wc_printf("

"); wc_printf(_("Authorization Required")); wc_printf("

\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(); } -- 2.30.2