merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -12,6 +12,7 @@ Fixed:
 - fixed -g arg to roundup-server (sf bug 973946)
 - better roundup-server usage string (sf bug 973352)
 - include "context" always, as documented (sf bug 965447)
+- fixed REMOTE_USER (external HTTP Basic auth) (sf bug 977309)
 
 
 2004-06-10 0.7.4

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.176.2.1 2004-05-27 21:52:44 richard Exp $
+# $Id: client.py,v 1.176.2.2 2004-06-22 23:36:49 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -284,6 +284,8 @@ def determine_user(self):
         self.clean_sessions()
         sessions = self.db.getSessionManager()
 
+        user = 'anonymous'
+
         # first up, try the REMOTE_USER var (from HTTP Basic Auth handled
         # by a front-end HTTP server)
         try:
@@ -293,7 +295,6 @@ def determine_user(self):
 
         # look up the user session cookie (may override the REMOTE_USER)
         cookie = Cookie.SimpleCookie(self.env.get('HTTP_COOKIE', ''))
-        user = 'anonymous'
         if (cookie.has_key(self.cookie_name) and
                 cookie[self.cookie_name].value != 'deleted'):