Mercurial > public > mercurial-scm > hg
diff mercurial/httprepo.py @ 15152:94b200a11cf7 stable
http: handle push of bundles > 2 GB again (issue3017)
It was very elegant that httpsendfile implemented __len__ like a string. It was
however also dangerous because that protocol can't handle sizes bigger than 2 GB.
Mercurial tried to work around that, but it turned out to be too easy to
introduce new errors in this area.
With this change __len__ is no longer implemented at all and the code will work
the same way for short and long posts.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 21 Sep 2011 22:52:00 +0200 |
| parents | 4f39610996fa |
| children | 85322c19c831 |
line wrap: on
line diff
--- a/mercurial/httprepo.py Tue Sep 13 17:01:07 2011 -0500 +++ b/mercurial/httprepo.py Wed Sep 21 22:52:00 2011 +0200 @@ -74,9 +74,14 @@ if cmd == 'pushkey': args['data'] = '' data = args.pop('data', None) + size = 0 + if util.safehasattr(data, 'length'): + size = data.length + elif data is not None: + size = len(data) headers = args.pop('headers', {}) - if data and self.ui.configbool('ui', 'usehttp2', False): + if size and self.ui.configbool('ui', 'usehttp2', False): headers['Expect'] = '100-Continue' headers['X-HgHttp2'] = '1' @@ -105,9 +110,6 @@ cu = "%s%s" % (self._url, qs) req = urllib2.Request(cu, data, headers) if data is not None: - # len(data) is broken if data doesn't fit into Py_ssize_t - # add the header ourself to avoid OverflowError - size = data.__len__() self.ui.debug("sending %s bytes\n" % size) req.add_unredirected_header('Content-Length', '%d' % size) try: