merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -15,6 +15,7 @@ Fixed:
 - use row locking in MySQL newid() (sf bug 1034211)
 - add sanity check for sort and group on same property (sf bug 1033477)
 - extend OTK and session table value cols to TEXT (sf bug 1031271)
+- fix lookup of REMOTE_USER (sf bug 1002923)
 
 
 2004-07-21 0.7.6

doc/index.txt

@@ -74,6 +74,7 @@ Seb Brezel,
 Titus Brown,
 Godefroid Chapelle,
 Roch'e Compaan,
+Wil Cooley,
 Joe Cooper,
 Kelley Dagley,
 Paul F. Dubois,

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.176.2.4 2004-08-02 22:42:55 richard Exp $
+# $Id: client.py,v 1.176.2.5 2004-10-07 23:14:23 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -284,14 +284,12 @@ 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:
-            user = os.getenv('REMOTE_USER')
-        except KeyError:
-            pass
+        if self.env.has_key('REMOTE_USER'):
+            user = self.env['REMOTE_USER']
+        else:
+            user = 'anonymous'
 
         # look up the user session cookie (may override the REMOTE_USER)
         cookie = Cookie.SimpleCookie(self.env.get('HTTP_COOKIE', ''))