From f233f19ac6c7260469d86e442c53ad1b1fd374b9 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 7 Jan 2011 15:51:04 -0500 Subject: [PATCH] Made the elimination of nocookies permanent. --- webcit/context_loop.c | 24 +++++++----------------- webcit/static/nocookies.html | 23 ----------------------- webcit/static/t/head.html | 18 +++++++----------- 3 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 webcit/static/nocookies.html diff --git a/webcit/context_loop.c b/webcit/context_loop.c index 26f6505f3..d492ce09b 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -572,23 +572,13 @@ void context_loop(ParsedHttpHdrs *Hdr) if (TheSession == NULL) { TheSession = CreateSession(1, 0, &SessionList, Hdr, &SessionListMutex); - if ((StrLength(Hdr->c_username) == 0) && (!Hdr->HR.DontNeedAuth)) { - - if ((Hdr->HR.Handler != NULL) && - (XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) { - OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0")); - Hdr->HR.prohibit_caching = 1; - } - - /* - * I don't think we need this anymore now that guest mode is working - * ajc 2011jan07 - * - else { - OverrideRequest(Hdr, HKEY("GET /static/nocookies.html?force_close_session=yes HTTP/1.0")); - Hdr->HR.prohibit_caching = 1; - } - */ + if ( (StrLength(Hdr->c_username) == 0) + && (!Hdr->HR.DontNeedAuth) + && (Hdr->HR.Handler != NULL) + && ((XHTTP_COMMANDS & Hdr->HR.Handler->Flags) == XHTTP_COMMANDS) + ) { + OverrideRequest(Hdr, HKEY("GET /401 HTTP/1.0")); + Hdr->HR.prohibit_caching = 1; } if (StrLength(Hdr->c_language) > 0) { diff --git a/webcit/static/nocookies.html b/webcit/static/nocookies.html deleted file mode 100644 index d3ba1356c..000000000 --- a/webcit/static/nocookies.html +++ /dev/null @@ -1,23 +0,0 @@ - - - Error - - - -
-

Sorry!

-
-This site requires both Cookies and JavaScript to be enabled in your browser.
-Please enable these features and log in again. We are sorry for the inconvenience. -
- -
-Back to login... -
- -
-Your browser may cache this site. In doubt, press CTRL+SHIFT+R (Firefox) or SHIFT F5 (Internet explorer) to get the actual content, or press the above link to login again. -
- - - diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html index 0efa162d8..897276054 100644 --- a/webcit/static/t/head.html +++ b/webcit/static/t/head.html @@ -28,29 +28,25 @@ - + - + -- 2.30.2