Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D2291
hgweb: correctly bytes-ify status, not string-ifyClosedPublic
hgweb: correctly bytes-ify status, not string-ify
ClosedPublic
Authored by durin42 on Feb 17 2018, 1:41 AM.
Revision Contents
Revision Contents
Diff 5803
Diff 5803
mercurial/hgweb/request.py
| self.headers.extend(status.headers) | self.headers.extend(status.headers) | ||||
| if status.code == HTTP_NOT_MODIFIED: | if status.code == HTTP_NOT_MODIFIED: | ||||
| # RFC 2616 Section 10.3.5: 304 Not Modified has cases where | # RFC 2616 Section 10.3.5: 304 Not Modified has cases where | ||||
| # it MUST NOT include any headers other than these and no | # it MUST NOT include any headers other than these and no | ||||
| # body | # body | ||||
| self.headers = [(k, v) for (k, v) in self.headers if | self.headers = [(k, v) for (k, v) in self.headers if | ||||
| k in ('Date', 'ETag', 'Expires', | k in ('Date', 'ETag', 'Expires', | ||||
| 'Cache-Control', 'Vary')] | 'Cache-Control', 'Vary')] | ||||
| status = statusmessage(status.code, str(status)) | status = statusmessage(status.code, pycompat.bytestr(status)) | ||||
| elif status == 200: | elif status == 200: | ||||
| status = '200 Script output follows' | status = '200 Script output follows' | ||||
| elif isinstance(status, int): | elif isinstance(status, int): | ||||
| status = statusmessage(status) | status = statusmessage(status) | ||||
| self.server_write = self._start_response(status, self.headers) | self.server_write = self._start_response(status, self.headers) | ||||
| self._start_response = None | self._start_response = None | ||||
| self.headers = [] | self.headers = [] | ||||