diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -136,7 +136,7 @@ class requestcontext(object): logourl = self.config('web', 'logourl') logoimg = self.config('web', 'logoimg') staticurl = (self.config('web', 'staticurl') - or req.apppath + '/static/') + or req.apppath.rstrip('/') + '/static/') if not staticurl.endswith('/'): staticurl += '/' diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -514,7 +514,7 @@ class hgwebdir(object): logourl = config('web', 'logourl') logoimg = config('web', 'logoimg') staticurl = (config('web', 'staticurl') - or req.apppath + '/static/') + or req.apppath.rstrip('/') + '/static/') if not staticurl.endswith('/'): staticurl += '/'