This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2741

wireprotoserver: remove broken optimization for non-httplib client
ClosedPublic

Authored by indygreg on Mar 8 2018, 8:06 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG5a3c83412f79: wireprotoserver: remove broken optimization for non-httplib client
rHG9a6216c18ffd: wireprotoserver: remove broken optimization for non-httplib client
Summary

There was an experimental non-httplib client in core for several
years. It was removed a week or so ago.

We kept the optimization for this client in the server code. I'm
not sure if that was intended or not. But it doesn't matter: the
code was wrong.

Because the code was accessing a WSGI environment dict, it needed to
access the HTTP_X_HGHTTP2 key to actually read the HTTP header. So
the code deleted by this commit wasn't actually doing anything
meaningful. Doh.

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.Mar 8 2018, 8:06 PM
durin42 accepted this revision.Mar 9 2018, 2:24 PM
This revision is now accepted and ready to land.Mar 9 2018, 2:24 PM
Closed by commit rHG9a6216c18ffd: wireprotoserver: remove broken optimization for non-httplib client (authored by indygreg). · Explain WhyMar 9 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (5 lines)

Diff 6785

mercurial/wireprotoserver.py

# we always read HTTP request data from the client, thus # we always read HTTP request data from the client, thus
# ensuring httplib transitions to a state that allows it to read # ensuring httplib transitions to a state that allows it to read
# the HTTP response. In other words, it helps prevent deadlocks # the HTTP response. In other words, it helps prevent deadlocks
# on clients using httplib. # on clients using httplib.
if (wsgireq.env[r'REQUEST_METHOD'] == r'POST' and if (wsgireq.env[r'REQUEST_METHOD'] == r'POST' and
# But not if Expect: 100-continue is being used. # But not if Expect: 100-continue is being used.
(wsgireq.env.get('HTTP_EXPECT', (wsgireq.env.get('HTTP_EXPECT',
'').lower() != '100-continue') or '').lower() != '100-continue')):
# Or the non-httplib HTTP library is being advertised by
# the client.
wsgireq.env.get('X-HgHttp2', '')):
wsgireq.drain() wsgireq.drain()
else: else:
wsgireq.headers.append((r'Connection', r'Close')) wsgireq.headers.append((r'Connection', r'Close'))
# TODO This response body assumes the failed command was # TODO This response body assumes the failed command was
# "unbundle." That assumption is not always valid. # "unbundle." That assumption is not always valid.
wsgireq.respond(e, HGTYPE, body='0\n%s\n' % pycompat.bytestr(e)) wsgireq.respond(e, HGTYPE, body='0\n%s\n' % pycompat.bytestr(e))