changeset 1293:ae5b07e75ffd beta

fixed issue #181, and small fix in gitmiddleware
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 27 Apr 2011 01:27:39 +0200
parents c0335c1dee36
children 6f3411bd163d
files docs/changelog.rst rhodecode/lib/middleware/simplegit.py rhodecode/lib/middleware/simplehg.py
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Wed Apr 27 01:19:17 2011 +0200
+++ b/docs/changelog.rst	Wed Apr 27 01:27:39 2011 +0200
@@ -53,7 +53,7 @@
 - fixed #126 Deleting repository on Windows, rename used incompatible chars. 
 - #150 fixes for errors on repositories mapped in db but corrupted in 
   filesystem
-  
+- fixed problem with ascendant characters in realm #181
 
 1.1.8 (**2011-04-12**)
 ======================
--- a/rhodecode/lib/middleware/simplegit.py	Wed Apr 27 01:19:17 2011 +0200
+++ b/rhodecode/lib/middleware/simplegit.py	Wed Apr 27 01:27:39 2011 +0200
@@ -98,7 +98,7 @@
         #authenticate this git request using
         self.authenticate = AuthBasicAuthenticator('', authfunc)
         self.ipaddr = '0.0.0.0'
-        self.repository = None
+        self.repo_name = None
         self.username = None
         self.action = None
 
@@ -147,8 +147,8 @@
                 #==============================================================
 
                 if not REMOTE_USER(environ):
-                    self.authenticate.realm = str(
-                                                self.config['rhodecode_realm'])
+                    self.authenticate.realm = self.config['rhodecode_realm'].\
+                        encode('utf8', 'replace')
                     result = self.authenticate(environ)
                     if isinstance(result, str):
                         AUTH_TYPE.update(environ, 'basic')
--- a/rhodecode/lib/middleware/simplehg.py	Wed Apr 27 01:19:17 2011 +0200
+++ b/rhodecode/lib/middleware/simplehg.py	Wed Apr 27 01:27:39 2011 +0200
@@ -112,8 +112,8 @@
                 #==============================================================
 
                 if not REMOTE_USER(environ):
-                    self.authenticate.realm = str(
-                                                self.config['rhodecode_realm'])
+                    self.authenticate.realm = self.config['rhodecode_realm'].\
+                        encode('utf8', 'replace')
                     result = self.authenticate(environ)
                     if isinstance(result, str):
                         AUTH_TYPE.update(environ, 'basic')