Mercurial > hg-stable
changeset 34740:b2601c5977a4
hgweb: more "http headers are native strs" cleanup
Differential Revision: https://phab.mercurial-scm.org/D1108
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 15 Oct 2017 00:38:33 -0400 |
| parents | b880cc11da5d |
| children | 60143d038eb7 |
| files | mercurial/hgweb/hgweb_mod.py mercurial/hgweb/protocol.py mercurial/hgweb/server.py |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py Sun Oct 15 00:05:43 2017 -0400 +++ b/mercurial/hgweb/hgweb_mod.py Sun Oct 15 00:38:33 2017 -0400 @@ -378,7 +378,7 @@ req.env.get('X-HgHttp2', '')): req.drain() else: - req.headers.append(('Connection', 'Close')) + req.headers.append((r'Connection', r'Close')) req.respond(inst, protocol.HGTYPE, body='0\n%s\n' % inst) return ''
--- a/mercurial/hgweb/protocol.py Sun Oct 15 00:05:43 2017 -0400 +++ b/mercurial/hgweb/protocol.py Sun Oct 15 00:38:33 2017 -0400 @@ -75,10 +75,10 @@ args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) return args def getfile(self, fp): - length = int(self.req.env['CONTENT_LENGTH']) + length = int(self.req.env[r'CONTENT_LENGTH']) # If httppostargs is used, we need to read Content-Length # minus the amount that was consumed by args. - length -= int(self.req.env.get('HTTP_X_HGARGS_POST', 0)) + length -= int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) for s in util.filechunkiter(self.req, limit=length): fp.write(s) def redirect(self):
--- a/mercurial/hgweb/server.py Sun Oct 15 00:05:43 2017 -0400 +++ b/mercurial/hgweb/server.py Sun Oct 15 00:38:33 2017 -0400 @@ -194,9 +194,9 @@ self._chunked = (not self.close_connection and self.request_version == "HTTP/1.1") if self._chunked: - self.send_header('Transfer-Encoding', 'chunked') + self.send_header(r'Transfer-Encoding', r'chunked') else: - self.send_header('Connection', 'close') + self.send_header(r'Connection', r'close') self.end_headers() self.sent_headers = True