hgweb: handle 'baseurl' configurations with leading slash (issue2934) stable
authorwujek
Mon, 01 Aug 2011 09:48:10 +0200
branchstable
changeset 15001 dd74cd1e5d49
parent 15000 68b5d7005cca
child 15002 b55c1c6a793e
child 15004 d06b9c55ddab
hgweb: handle 'baseurl' configurations with leading slash (issue2934)
mercurial/hgweb/hgwebdir_mod.py
--- a/mercurial/hgweb/hgwebdir_mod.py	Mon Aug 01 19:53:00 2011 +0300
+++ b/mercurial/hgweb/hgwebdir_mod.py	Mon Aug 01 09:48:10 2011 +0200
@@ -368,4 +368,7 @@
             env['SERVER_NAME'] = u.host
             if u.port:
                 env['SERVER_PORT'] = u.port
-            env['SCRIPT_NAME'] = '/' + u.path
+            path = u.path or ""
+            if not path.startswith('/'):
+                path = '/' + path
+            env['SCRIPT_NAME'] = path