Rev 4770: Fix report activity for https with pycurl in http://bazaar.launchpad.net/~vila/bzr/2.0-integration/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Aug 19 11:14:18 UTC 2011
At http://bazaar.launchpad.net/~vila/bzr/2.0-integration/
------------------------------------------------------------
revno: 4770
revision-id: v.ladeuil+lp at free.fr-20110819111417-aw03j1ptcjwdk9ef
parent: pqm at pqm.ubuntu.com-20110308134153-t9v2zggqfynqsz18
fixes bug(s): https://launchpad.net/bugs/614713
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 2.0.7-dev
timestamp: Fri 2011-08-19 13:14:17 +0200
message:
Fix report activity for https with pycurl
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2011-03-08 11:48:17 +0000
+++ b/NEWS 2011-08-19 11:14:17 +0000
@@ -31,6 +31,9 @@
* Avoid spurious ValueErrors when autopacking a subset of the repository,
and seeing a revision without its related inventory
(John Arbash Meinel, #437003)
+
+* Fix activity reporting for pycurl when using https with some
+ implementations of curl. (Vincent Ladeuil, #614713)
Improvements
************
=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py 2009-08-19 16:33:39 +0000
+++ b/bzrlib/transport/http/_pycurl.py 2011-08-19 11:14:17 +0000
@@ -307,19 +307,19 @@
url, 'Unable to handle http code %d%s' % (code,msg))
def _debug_cb(self, kind, text):
- if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN,
- pycurl.INFOTYPE_SSL_DATA_IN):
+ if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN):
self._report_activity(len(text), 'read')
if (kind == pycurl.INFOTYPE_HEADER_IN
and 'http' in debug.debug_flags):
mutter('< %s' % text)
- elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT,
- pycurl.INFOTYPE_SSL_DATA_OUT):
+ elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT):
self._report_activity(len(text), 'write')
if (kind == pycurl.INFOTYPE_HEADER_OUT
and 'http' in debug.debug_flags):
mutter('> %s' % text)
- elif kind == pycurl.INFOTYPE_TEXT and 'http' in debug.debug_flags:
+ elif (kind in (pycurl.INFOTYPE_TEXT, pycurl.INFOTYPE_SSL_DATA_IN,
+ pycurl.INFOTYPE_SSL_DATA_OUT)
+ and 'http' in debug.debug_flags):
mutter('* %s' % text)
def _set_curl_options(self, curl):
More information about the bazaar-commits
mailing list