comparison mercurial/hgweb/hgwebdir_mod.py @ 15002:b55c1c6a793e

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Aug 2011 14:52:11 -0500
parents 44382887d012 dd74cd1e5d49
children a31b8e03af28
comparison
equal deleted inserted replaced
14999:f6a737357195 15002:b55c1c6a793e
368 if self._baseurl is not None: 368 if self._baseurl is not None:
369 u = util.url(self._baseurl) 369 u = util.url(self._baseurl)
370 env['SERVER_NAME'] = u.host 370 env['SERVER_NAME'] = u.host
371 if u.port: 371 if u.port:
372 env['SERVER_PORT'] = u.port 372 env['SERVER_PORT'] = u.port
373 env['SCRIPT_NAME'] = '/' + u.path 373 path = u.path or ""
374 if not path.startswith('/'):
375 path = '/' + path
376 env['SCRIPT_NAME'] = path