This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3726

hgweb: pass a sysstr to low-level _start_response method
ClosedPublic

Authored by durin42 on Jun 12 2018, 9:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9f499d28efb4: hgweb: pass a sysstr to low-level _start_response method
Summary

This fixes a regression in Python 3 support introduced in 7de7bd407251
on the stable branch. We're so early in do_hgweb that I don't see any
especially better choices than this.

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

durin42 created this revision.Jun 12 2018, 9:09 PM
Closed by commit rHG9f499d28efb4: hgweb: pass a sysstr to low-level _start_response method (authored by durin42). · Explain WhyJun 13 2018, 8:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 9047

mercurial/hgweb/server.py

def do_hgweb(self): def do_hgweb(self):
self.sent_headers = False self.sent_headers = False
path, query = _splitURI(self.path) path, query = _splitURI(self.path)
# Ensure the slicing of path below is valid # Ensure the slicing of path below is valid
if (path != self.server.prefix if (path != self.server.prefix
and not path.startswith(self.server.prefix + b'/')): and not path.startswith(self.server.prefix + b'/')):
self._start_response(common.statusmessage(404), []) self._start_response(pycompat.strurl(common.statusmessage(404)),
self._write("Not Found") [])
self._write(b"Not Found")
self._done() self._done()
return return
env = {} env = {}
env[r'GATEWAY_INTERFACE'] = r'CGI/1.1' env[r'GATEWAY_INTERFACE'] = r'CGI/1.1'
env[r'REQUEST_METHOD'] = self.command env[r'REQUEST_METHOD'] = self.command
env[r'SERVER_NAME'] = self.server.server_name env[r'SERVER_NAME'] = self.server.server_name
env[r'SERVER_PORT'] = str(self.server.server_port) env[r'SERVER_PORT'] = str(self.server.server_port)