Merge lp://staging/~vila/bzr/568421-http-error-length into lp://staging/bzr/2.2
Proposed by
Vincent Ladeuil
| Status: | Rejected |
|---|---|
| Rejected by: | Vincent Ladeuil |
| Proposed branch: | lp://staging/~vila/bzr/568421-http-error-length |
| Merge into: | lp://staging/bzr/2.2 |
| Diff against target: |
1929 lines (+713/-391) 45 files modified
NEWS (+66/-0) bzr (+1/-1) bzrlib/__init__.py (+1/-1) bzrlib/builtins.py (+27/-64) bzrlib/bundle/__init__.py (+0/-6) bzrlib/bundle/serializer/__init__.py (+0/-11) bzrlib/conflicts.py (+2/-2) bzrlib/diff.py (+2/-5) bzrlib/doc_generate/sphinx_conf.py (+1/-1) bzrlib/errors.py (+5/-2) bzrlib/help_topics/en/conflict-types.txt (+33/-32) bzrlib/log.py (+2/-2) bzrlib/lru_cache.py (+1/-9) bzrlib/mutabletree.py (+4/-0) bzrlib/revision.py (+0/-15) bzrlib/shelf_ui.py (+1/-1) bzrlib/tests/__init__.py (+1/-0) bzrlib/tests/blackbox/test_add.py (+14/-0) bzrlib/tests/blackbox/test_diff.py (+4/-1) bzrlib/tests/blackbox/test_status.py (+2/-14) bzrlib/tests/http_server.py (+35/-0) bzrlib/tests/per_transport.py (+14/-1) bzrlib/tests/per_workingtree/__init__.py (+1/-0) bzrlib/tests/per_workingtree/test_move.py (+0/-37) bzrlib/tests/per_workingtree/test_symlinks.py (+98/-0) bzrlib/tests/test_http.py (+14/-62) bzrlib/tests/test_lru_cache.py (+0/-7) bzrlib/tests/test_read_bundle.py (+4/-24) bzrlib/tests/test_remote.py (+1/-4) bzrlib/tests/test_revision.py (+0/-25) bzrlib/tests/test_smart_request.py (+5/-3) bzrlib/tests/test_treeshape.py (+41/-0) bzrlib/tests/test_upgrade.py (+0/-6) bzrlib/tests/treeshape.py (+2/-2) bzrlib/transform.py (+0/-16) bzrlib/transport/local.py (+4/-1) bzrlib/transport/sftp.py (+2/-0) bzrlib/version_info_formats/__init__.py (+0/-3) bzrlib/workingtree.py (+60/-10) doc/developers/index-plain.txt (+6/-0) doc/developers/index.txt (+8/-0) doc/developers/ppa.txt (+48/-20) doc/developers/testing.txt (+92/-0) doc/developers/transports.txt (+108/-0) doc/en/mini-tutorial/index.txt (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~vila/bzr/568421-http-error-length |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John A Meinel | Disapprove | ||
|
Review via email:
|
|||
Description of the change
Targeting 2.2 since this concerns maverick.
This fixes bug #568421 which was only occurring on gentoo when pycurl was used with gnutls
so far (which made it harder to reproduce, at least for me).
This is due to a long standing bug in the python BaseHTTPServer: some http/1.1 clients requires a length even if the connection is closed. pycurl/gnutls seems to be the only combination choking on this one (but pycurl is also pretty pedantic about connection closes).
It looks like maverick changed the ssl implementation used for pycurl (which made the bug easier to reproduce) so the diagnosis was easier.
There is no easy way to reuse the base send_error so I went for a simplified implementation less likely to fail in the future.
To post a comment you must log in.
Revision history for this message
| Vincent Ladeuil (vila) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/568421-http-error-length into lp:bzr/2.2.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> Targeting 2.2 since this concerns maverick.
>
> This fixes bug #568421 which was only occurring on gentoo when pycurl was used with gnutls
> so far (which made it harder to reproduce, at least for me).
>
> This is due to a long standing bug in the python BaseHTTPServer: some http/1.1 clients requires a length even if the connection is closed. pycurl/gnutls seems to be the only combination choking on this one (but pycurl is also pretty pedantic about connection closes).
>
> It looks like maverick changed the ssl implementation used for pycurl (which made the bug easier to reproduce) so the diagnosis was easier.
>
> There is no easy way to reuse the base send_error so I went for a simplified implementation less likely to fail in the future.
>
merge: rejected
I'm rejecting the 2.2 submission for now, because it was based on the
2.3 branch, and thus brings in the NEWS and all the other stuff in
trunk. You are welcome to actually cherry pick a patch back to 2.2.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkx
BJcAoJSbh+
=pMmV
-----END PGP SIGNATURE-----