This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4834

py3: convert HTTP request headers to str
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc421c22d3ad2: py3: convert HTTP request headers to str
rHGa5183c6f2270: py3: convert HTTP request headers to str
Summary

The low-level request object ideally takes system strings for
HTTP request headers and values. If we send in bytes, it works. But
a duplicate header check fails and various tests emit duplicate
user-agent headers.

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 rHGa5183c6f2270: py3: convert HTTP request headers to str (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/debugcommands.py (5 lines)

Diff 11553

mercurial/debugcommands.py

method, httppath = request[1:] method, httppath = request[1:]
headers = {} headers = {}
body = None body = None
frames = [] frames = []
for line in lines: for line in lines:
line = line.lstrip() line = line.lstrip()
m = re.match(b'^([a-zA-Z0-9_-]+): (.*)$', line) m = re.match(b'^([a-zA-Z0-9_-]+): (.*)$', line)
if m: if m:
headers[m.group(1)] = m.group(2) # Headers need to use native strings.
key = pycompat.strurl(m.group(1))
value = pycompat.strurl(m.group(2))
headers[key] = value
continue continue
if line.startswith(b'BODYFILE '): if line.startswith(b'BODYFILE '):
with open(line.split(b' ', 1), 'rb') as fh: with open(line.split(b' ', 1), 'rb') as fh:
body = fh.read() body = fh.read()
elif line.startswith(b'frame '): elif line.startswith(b'frame '):
frame = wireprotoframing.makeframefromhumanstring( frame = wireprotoframing.makeframefromhumanstring(
line[len(b'frame '):]) line[len(b'frame '):])