Mercurial > hg
changeset 36873:98baf8dea553
hgweb: port static file handling to new response API
hgwebdir_mod hasn't received as much porting effort. So we had to
do some minor plumbing to get it to match hgweb_mod and to support
the new response object.
Differential Revision: https://phab.mercurial-scm.org/D2789
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 10 Mar 2018 15:46:29 -0800 |
| parents | 89002d07a114 |
| children | 40193f977a8b |
| files | mercurial/hgweb/common.py mercurial/hgweb/hgwebdir_mod.py mercurial/hgweb/webcommands.py |
| diffstat | 3 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/common.py Sat Mar 10 15:37:29 2018 -0800 +++ b/mercurial/hgweb/common.py Sat Mar 10 15:46:29 2018 -0800 @@ -153,7 +153,7 @@ return True -def staticfile(directory, fname, req): +def staticfile(directory, fname, res): """return a file inside directory with guessed Content-Type header fname always uses '/' as directory separator and isn't allowed to @@ -178,7 +178,9 @@ with open(path, 'rb') as fh: data = fh.read() - req.respond(HTTP_OK, ct, body=data) + res.headers['Content-Type'] = ct + res.setbodybytes(data) + return res except TypeError: raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename') except OSError as err:
--- a/mercurial/hgweb/hgwebdir_mod.py Sat Mar 10 15:37:29 2018 -0800 +++ b/mercurial/hgweb/hgwebdir_mod.py Sat Mar 10 15:46:29 2018 -0800 @@ -230,12 +230,14 @@ def _runwsgi(self, wsgireq): req = wsgireq.req + res = wsgireq.res try: self.refresh() csp, nonce = cspvalues(self.ui) if csp: + res.headers['Content-Security-Policy'] = csp wsgireq.headers.append(('Content-Security-Policy', csp)) virtual = wsgireq.env.get("PATH_INFO", "").strip('/') @@ -243,6 +245,10 @@ ctype = tmpl('mimetype', encoding=encoding.encoding) ctype = templater.stringify(ctype) + # Global defaults. These can be overridden by any handler. + res.status = '200 Script output follows' + res.headers['Content-Type'] = ctype + # a static file if virtual.startswith('static/') or 'static' in req.qsparams: if virtual.startswith('static/'): @@ -256,8 +262,9 @@ if isinstance(tp, str): tp = [tp] static = [os.path.join(p, 'static') for p in tp] - staticfile(static, fname, wsgireq) - return [] + + staticfile(static, fname, res) + return res.sendresponse() # top-level index
--- a/mercurial/hgweb/webcommands.py Sat Mar 10 15:37:29 2018 -0800 +++ b/mercurial/hgweb/webcommands.py Sat Mar 10 15:46:29 2018 -0800 @@ -1232,8 +1232,9 @@ if isinstance(tp, str): tp = [tp] static = [os.path.join(p, 'static') for p in tp] - staticfile(static, fname, req) - return [] + + staticfile(static, fname, web.res) + return web.res @webcommand('graph') def graph(web, req, tmpl):