This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1085

hgweb: set sent_headers attr as early as practical
ClosedPublic

Authored by durin42 on Oct 15 2017, 12:57 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG60e7da55e5e6: hgweb: set sent_headers attr as early as practical
Summary

While doing Python 3 porting work, I've seen exceptions happen in
parts of hgweb we normally assume are robust. It won't hurt anything
to set this attribute significantly earlier, so let's do so and save
confusing during the porting process.

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.Oct 15 2017, 12:57 AM
yuja accepted this revision.Oct 15 2017, 9:19 AM
This revision is now accepted and ready to land.Oct 15 2017, 9:19 AM
Closed by commit rHG60e7da55e5e6: hgweb: set sent_headers attr as early as practical (authored by durin42). · Explain WhyOct 15 2017, 9:27 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 2775

mercurial/hgweb/server.py

newline = chr(10) newline = chr(10)
self.log_error(r"Exception happened during processing " self.log_error(r"Exception happened during processing "
r"request '%s':%s%s", self.path, newline, tb) r"request '%s':%s%s", self.path, newline, tb)
def do_GET(self): def do_GET(self):
self.do_POST() self.do_POST()
def do_hgweb(self): def do_hgweb(self):
self.sent_headers = False
path, query = _splitURI(self.path) path, query = _splitURI(self.path)
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)
env[r'REQUEST_URI'] = self.path env[r'REQUEST_URI'] = self.path
env[r'wsgi.multithread'] = isinstance(self.server, env[r'wsgi.multithread'] = isinstance(self.server,
socketserver.ThreadingMixIn) socketserver.ThreadingMixIn)
env[r'wsgi.multiprocess'] = isinstance(self.server, env[r'wsgi.multiprocess'] = isinstance(self.server,
socketserver.ForkingMixIn) socketserver.ForkingMixIn)
env[r'wsgi.run_once'] = 0 env[r'wsgi.run_once'] = 0
self.saved_status = None self.saved_status = None
self.saved_headers = [] self.saved_headers = []
self.sent_headers = False
self.length = None self.length = None
self._chunked = None self._chunked = None
for chunk in self.server.application(env, self._start_response): for chunk in self.server.application(env, self._start_response):
self._write(chunk) self._write(chunk)
if not self.sent_headers: if not self.sent_headers:
self.send_headers() self.send_headers()
self._done() self._done()