minor cleanup

[citadel.git] / webcit / context_loop.c

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index 2c0540fd8bfb2305cec28812b51116f992097f65..01f797c0139e80086e5ead94505d192924b65342 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -4,12 +4,12 @@
  * keep track of things.  If the HTTP request doesn't belong to any currently
  * active session, a new session is started.
  *
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2011 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
@@ -572,17 +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;                           
-                       }
-                       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) {