( )⚙ D3250 hgweb: use native strings when interfacing with stdlib headers

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3250

hgweb: use native strings when interfacing with stdlib headers
ClosedPublic

Authored by durin42 on Apr 11 2018, 4:42 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb5ca5d34fe8d: hgweb: use native strings when interfacing with stdlib headers
Summary

We're still parsing the stdlib-provided headers here, so we need to
tread carefully and use native strings. Yuck.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Apr 11 2018, 4:42 PM
indygreg accepted this revision.Apr 12 2018, 11:20 AM
This revision is now accepted and ready to land.Apr 12 2018, 11:20 AM
Closed by commit rHGb5ca5d34fe8d: hgweb: use native strings when interfacing with stdlib headers (authored by durin42). · Explain WhyApr 12 2018, 11:34 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 8016

mercurial/hgweb/server.py

env[r'REMOTE_ADDR'] = self.client_address[0] env[r'REMOTE_ADDR'] = self.client_address[0]
env[r'QUERY_STRING'] = query or r'' env[r'QUERY_STRING'] = query or r''
if pycompat.ispy3: if pycompat.ispy3:
if self.headers.get_content_type() is None: if self.headers.get_content_type() is None:
env[r'CONTENT_TYPE'] = self.headers.get_default_type() env[r'CONTENT_TYPE'] = self.headers.get_default_type()
else: else:
env[r'CONTENT_TYPE'] = self.headers.get_content_type() env[r'CONTENT_TYPE'] = self.headers.get_content_type()
length = self.headers.get('content-length') length = self.headers.get(r'content-length')
else: else:
if self.headers.typeheader is None: if self.headers.typeheader is None:
env[r'CONTENT_TYPE'] = self.headers.type env[r'CONTENT_TYPE'] = self.headers.type
else: else:
env[r'CONTENT_TYPE'] = self.headers.typeheader env[r'CONTENT_TYPE'] = self.headers.typeheader
length = self.headers.getheader('content-length') length = self.headers.getheader(r'content-length')
if length: if length:
env[r'CONTENT_LENGTH'] = length env[r'CONTENT_LENGTH'] = length
for header in [h for h in self.headers.keys() for header in [h for h in self.headers.keys()
if h not in ('content-type', 'content-length')]: if h not in (r'content-type', r'content-length')]:
hkey = r'HTTP_' + header.replace(r'-', r'_').upper() hkey = r'HTTP_' + header.replace(r'-', r'_').upper()
hval = self.headers.get(header) hval = self.headers.get(header)
hval = hval.replace(r'\n', r'').strip() hval = hval.replace(r'\n', r'').strip()
if hval: if hval:
env[hkey] = hval env[hkey] = hval
env[r'SERVER_PROTOCOL'] = self.request_version env[r'SERVER_PROTOCOL'] = self.request_version
env[r'wsgi.version'] = (1, 0) env[r'wsgi.version'] = (1, 0)
env[r'wsgi.url_scheme'] = pycompat.sysstr(self.url_scheme) env[r'wsgi.url_scheme'] = pycompat.sysstr(self.url_scheme)