Merge lp://staging/~vila/bzr/614713-https-pycurl-activity into lp://staging/bzr
Proposed by
Vincent Ladeuil
| Status: | Merged |
|---|---|
| Approved by: | John A Meinel |
| Approved revision: | 6083 |
| Merge reported by: | Vincent Ladeuil |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~vila/bzr/614713-https-pycurl-activity |
| Merge into: | lp://staging/bzr |
| Diff against target: |
45 lines (+8/-5) 2 files modified
bzrlib/transport/http/_pycurl.py (+5/-5) doc/en/release-notes/bzr-2.5.txt (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~vila/bzr/614713-https-pycurl-activity |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| bzr-core | Pending | ||
|
Review via email:
|
|||
Description of the change
The issue was the activity tests were failing on gentoo for
*some* curl implementations.
We use a debug callback to track the bytes read/written. This
callback is called with a kind and a text.
Some curl implementations calls our callback for
INFOTYPE_
encrypted text), some don't.
The bug is that we should never take these kinds into account
anyway but until I could reproduce the issue I didn't realize
that.
These kinds will still be reported with -Dhttp for debug purposes.
To post a comment you must log in.
Revision history for this message
| John A Meinel (jameinel) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Merge:approve
This sort of thing seems reasonable to backport.
John
=:->
On Aug 18, 2011 11:17 AM, "Vincent Ladeuil" <email address hidden> wrote:
> Vincent Ladeuil has proposed merging
lp:~vila/bzr/614713-https-pycurl-activity into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #614713 in Bazaar: "selftests fail assertActivitie
compiled against openssl"
> https:/
>
> For more details, see:
>
https:/
>
> The issue was the activity tests were failing on gentoo for
> *some* curl implementations.
>
> We use a debug callback to track the bytes read/written. This
> callback is called with a kind and a text.
>
> Some curl implementations calls our callback for
> INFOTYPE_
> encrypted text), some don't.
>
> The bug is that we should never take these kinds into account
> anyway but until I could reproduce the issue I didn't realize
> that.
>
> These kinds will still be reported with -Dhttp for debug purposes.
> --
>
https:/
> Your team bzr-core is requested to review the proposed merge of
lp:~vila/bzr/614713-https-pycurl-activity into lp:bzr.