This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4833

py3: use system strings in HTTP server code
ClosedPublic

Authored by indygreg on Oct 2 2018, 2:17 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG8c7ecd32ccce: py3: use system strings in HTTP server code
rHGffb9da79bc2f: py3: use system strings in HTTP server code
Summary

Previously the source transformer was converting some string literals
to bytes and we were comparing a system native string to bytes
and this was leading to sending the wrong HTTP response headers on
Python 3.

After this change, we now properly send Transfer-Encoding and
Connection response headers on Python 3.

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.

Event Timeline

indygreg created this revision.Oct 2 2018, 2:17 AM
Closed by commit rHGffb9da79bc2f: py3: use system strings in HTTP server code (authored by indygreg). · Explain WhyOct 2 2018, 8:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/server.py (6 lines)

Diff 11552

mercurial/hgweb/server.py

"start_response() called") "start_response() called")
saved_status = self.saved_status.split(None, 1) saved_status = self.saved_status.split(None, 1)
saved_status[0] = int(saved_status[0]) saved_status[0] = int(saved_status[0])
self.send_response(*saved_status) self.send_response(*saved_status)
self.length = None self.length = None
self._chunked = False self._chunked = False
for h in self.saved_headers: for h in self.saved_headers:
self.send_header(*h) self.send_header(*h)
if h[0].lower() == 'content-length': if h[0].lower() == r'content-length':
self.length = int(h[1]) self.length = int(h[1])
if (self.length is None and if (self.length is None and
saved_status[0] != common.HTTP_NOT_MODIFIED): saved_status[0] != common.HTTP_NOT_MODIFIED):
self._chunked = (not self.close_connection and self._chunked = (not self.close_connection and
self.request_version == "HTTP/1.1") self.request_version == r'HTTP/1.1')
if self._chunked: if self._chunked:
self.send_header(r'Transfer-Encoding', r'chunked') self.send_header(r'Transfer-Encoding', r'chunked')
else: else:
self.send_header(r'Connection', r'close') self.send_header(r'Connection', r'close')
self.end_headers() self.end_headers()
self.sent_headers = True self.sent_headers = True
def _start_response(self, http_status, headers, exc_info=None): def _start_response(self, http_status, headers, exc_info=None):
assert isinstance(http_status, str) assert isinstance(http_status, str)
code, msg = http_status.split(None, 1) code, msg = http_status.split(None, 1)
code = int(code) code = int(code)
self.saved_status = http_status self.saved_status = http_status
bad_headers = ('connection', 'transfer-encoding') bad_headers = (r'connection', r'transfer-encoding')
self.saved_headers = [h for h in headers self.saved_headers = [h for h in headers
if h[0].lower() not in bad_headers] if h[0].lower() not in bad_headers]
return self._write return self._write
def _write(self, data): def _write(self, data):
if not self.saved_status: if not self.saved_status:
raise AssertionError("data written before start_response() called") raise AssertionError("data written before start_response() called")
elif not self.sent_headers: elif not self.sent_headers: