Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/hgweb/hgweb_mod.py @ 36813:ec46415ed826
hgweb: always use "?" when writing session vars
This code resolves a string to insert in URLs as part of a
query string. Essentially, it resolves the {sessionvars}
template keyword, which is used by hgweb templates to build
a URL as a string.
The whole approach here feels wrong because there's no way of
knowing when this code runs how the final URL will look. There
could be additional URL fragments added before this template
keyword that add a query string component.
Furthermore, I don't think there's *any* for req.url to have
a query string. That's because the code that populates this
variable only takes SCRIPT_NAME and REPO_NAME into account. The
"?" character it is searching for would only be added if some
code attempted to add QUERY_STRING to the URL. Hacking the code
up to raise if "?" is present in the URL yields a clean test
suite run. I'm not sure if we broke this code or if it has
always been broken.
Anyway, this commit removes support for emitting "&" as the
first character in {sessionvars} and makes it always emit "?",
which is what it was always doing before AFAICT.
Differential Revision: https://phab.mercurial-scm.org/D2733
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Thu, 08 Mar 2018 15:14:32 -0800 |
parents | b9b968e21f78 |
children | 69b2d0900cd7 |
comparison
equal
deleted
inserted
replaced
36812:b9b968e21f78 | 36813:ec46415ed826 |
---|---|
175 styles, (style, mapfile) = getstyle(wsgireq, self.config, | 175 styles, (style, mapfile) = getstyle(wsgireq, self.config, |
176 self.templatepath) | 176 self.templatepath) |
177 if style == styles[0]: | 177 if style == styles[0]: |
178 vars['style'] = style | 178 vars['style'] = style |
179 | 179 |
180 start = '&' if wsgireq.url[-1] == r'?' else '?' | 180 sessionvars = webutil.sessionvars(vars, '?') |
181 sessionvars = webutil.sessionvars(vars, start) | |
182 | 181 |
183 if not self.reponame: | 182 if not self.reponame: |
184 self.reponame = (self.config('web', 'name', '') | 183 self.reponame = (self.config('web', 'name', '') |
185 or wsgireq.env.get('REPO_NAME') | 184 or wsgireq.env.get('REPO_NAME') |
186 or wsgireq.url.strip(r'/') or self.repo.root) | 185 or wsgireq.url.strip(r'/') or self.repo.root) |