← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_pycurl.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-20 09:28:27 UTC
  • mfrom: (5050.78.2 2.2)
  • mto: (5609.48.8 2.3)
  • mto: This revision was merged to the branch mainline in revision 6090.
  • Revision ID: v.ladeuil+lp@free.fr-20110820092827-9dyakfslp0r3hb1k
Merge 2.2 into 2.3 (including fix for #614713, #609187 and #812928)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
325
325
                % (code, msg, plaintext_body))
326
326
 
327
327
    def _debug_cb(self, kind, text):
328
 
        if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN,
329
 
                    pycurl.INFOTYPE_SSL_DATA_IN):
 
328
        if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN):
330
329
            self._report_activity(len(text), 'read')
331
330
            if (kind == pycurl.INFOTYPE_HEADER_IN
332
331
                and 'http' in debug.debug_flags):
333
332
                mutter('< %s' % text)
334
 
        elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT,
335
 
                      pycurl.INFOTYPE_SSL_DATA_OUT):
 
333
        elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT):
336
334
            self._report_activity(len(text), 'write')
337
335
            if (kind == pycurl.INFOTYPE_HEADER_OUT
338
336
                and 'http' in debug.debug_flags):
339
337
                mutter('> %s' % text)
340
 
        elif kind == pycurl.INFOTYPE_TEXT and 'http' in debug.debug_flags:
 
338
        elif (kind in (pycurl.INFOTYPE_TEXT, pycurl.INFOTYPE_SSL_DATA_IN,
 
339
                       pycurl.INFOTYPE_SSL_DATA_OUT)
 
340
              and 'http' in debug.debug_flags):
341
341
            mutter('* %s' % text)
342
342
 
343
343
    def _set_curl_options(self, curl):