Rev 6445: (jelmer) Change the default HTTPS implementation from pycurl to urllib. in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6445 [merge]
revision-id: pqm at pqm.ubuntu.com-20120123194347-5002stbrf1s57jqk
parent: pqm at pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
parent: jelmer at samba.org-20120123150714-2zrvcc6bxz9oiprt
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-01-23 19:43:47 +0000
message:
  (jelmer) Change the default HTTPS implementation from pycurl to urllib.
   (Jelmer Vernooij)
modified:
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2012-01-20 13:15:15 +0000
+++ b/bzrlib/transport/__init__.py	2012-01-23 15:07:14 +0000
@@ -1782,15 +1782,15 @@
                  help="Read-only access of branches exported on the web.")
 register_transport_proto('https://',
             help="Read-only access of branches exported on the web using SSL.")
-# The default http implementation is urllib, but https uses pycurl if available
+# The default http implementation is urllib
 register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
                         'PyCurlTransport')
 register_lazy_transport('http://', 'bzrlib.transport.http._urllib',
                         'HttpTransport_urllib')
+register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
+                        'PyCurlTransport')
 register_lazy_transport('https://', 'bzrlib.transport.http._urllib',
                         'HttpTransport_urllib')
-register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
-                        'PyCurlTransport')
 
 register_transport_proto('ftp://', help="Access using passive FTP.")
 register_lazy_transport('ftp://', 'bzrlib.transport.ftp', 'FtpTransport')

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-01-16 13:49:34 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-01-23 15:07:14 +0000
@@ -26,6 +26,11 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+ * Access to HTTPS URLs now uses the urrllib implementation by default.
+   For the old pycurl-based implementation, specify ``https+pycurl://`` as
+   the URL scheme when accessing a HTTPS location.
+   (Jelmer Vernooij, #125055)
+
 Bug Fixes
 *********