changeset 2490:3af075731c43 maint-0.7

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Tue, 22 Jun 2004 23:36:49 +0000
parents 9184fbd2aab0
children e84f07f00fea
files CHANGES.txt roundup/cgi/client.py
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.txt	Mon Jun 21 05:54:11 2004 +0000
+++ b/CHANGES.txt	Tue Jun 22 23:36:49 2004 +0000
@@ -12,6 +12,7 @@
 - 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
--- a/roundup/cgi/client.py	Mon Jun 21 05:54:11 2004 +0000
+++ b/roundup/cgi/client.py	Tue Jun 22 23:36:49 2004 +0000
@@ -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 @@
         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 @@
 
         # 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'):
 

Roundup Issue Tracker: http://roundup-tracker.org/