Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/request.py @ 36288:a0a004b29a51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: correctly bytes-ify status, not string-ify Differential Revision: https://phab.mercurial-scm.org/D2291
author Augie Fackler <augie@google.com>
date Sat, 17 Feb 2018 00:28:55 -0500
parents 95be8928d6b2
children af0a19d8812b
comparison
equal deleted inserted replaced
36287:84a6e39bc723 36288:a0a004b29a51
113 # it MUST NOT include any headers other than these and no 113 # it MUST NOT include any headers other than these and no
114 # body 114 # body
115 self.headers = [(k, v) for (k, v) in self.headers if 115 self.headers = [(k, v) for (k, v) in self.headers if
116 k in ('Date', 'ETag', 'Expires', 116 k in ('Date', 'ETag', 'Expires',
117 'Cache-Control', 'Vary')] 117 'Cache-Control', 'Vary')]
118 status = statusmessage(status.code, str(status)) 118 status = statusmessage(status.code, pycompat.bytestr(status))
119 elif status == 200: 119 elif status == 200:
120 status = '200 Script output follows' 120 status = '200 Script output follows'
121 elif isinstance(status, int): 121 elif isinstance(status, int):
122 status = statusmessage(status) 122 status = statusmessage(status)
123 123