This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4728

keepalive: be more careful about self._rbuf when calling super impls
ClosedPublic

Authored by durin42 on Sep 24 2018, 10:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1cf1680b0554: keepalive: be more careful about self._rbuf when calling super impls
Summary

In Python 3, HTTPResponse implements read() in terms of readinto(),
which was calling back into our readinto(), which duplicates
self._rbuf if it's not empty. Before calling into super's read(),
ensure self._rbuf is empty.

Inheritance is bad, and undocumented self-use of your public API is
one of many reasons.

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.Sep 24 2018, 10:55 PM
Closed by commit rHG1cf1680b0554: keepalive: be more careful about self._rbuf when calling super impls (authored by durin42). · Explain WhySep 24 2018, 10:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/keepalive.py (7 lines)

Diff 11338

mercurial/keepalive.py

if self._rbuf and amt is not None: if self._rbuf and amt is not None:
L = len(self._rbuf) L = len(self._rbuf)
if amt > L: if amt > L:
amt -= L amt -= L
else: else:
s = self._rbuf[:amt] s = self._rbuf[:amt]
self._rbuf = self._rbuf[amt:] self._rbuf = self._rbuf[amt:]
return s return s
# Careful! http.client.HTTPResponse.read() on Python 3 is
s = self._rbuf + self._raw_read(amt) # implemented using readinto(), which can duplicate self._rbuf
# if it's not empty.
s = self._rbuf
self._rbuf = '' self._rbuf = ''
s += self._raw_read(amt)
return s return s
# stolen from Python SVN #68532 to fix issue1088 # stolen from Python SVN #68532 to fix issue1088
def _read_chunked(self, amt): def _read_chunked(self, amt):
chunk_left = self.chunk_left chunk_left = self.chunk_left
parts = [] parts = []
while True: while True: