mercurial/keepalive.py
changeset 39816 1cf1680b0554
parent 39649 d6d094259d9c
child 40031 f2dffa1359c6
--- a/mercurial/keepalive.py	Mon Sep 17 11:50:59 2018 -0700
+++ b/mercurial/keepalive.py	Mon Sep 24 22:45:32 2018 -0400
@@ -417,9 +417,12 @@
                 s = self._rbuf[:amt]
                 self._rbuf = self._rbuf[amt:]
                 return s
-
-        s = self._rbuf + self._raw_read(amt)
+        # Careful! http.client.HTTPResponse.read() on Python 3 is
+        # implemented using readinto(), which can duplicate self._rbuf
+        # if it's not empty.
+        s = self._rbuf
         self._rbuf = ''
+        s += self._raw_read(amt)
         return s
 
     # stolen from Python SVN #68532 to fix issue1088