Rev 3885: (jam) Default to urllib for http and pycurl for https in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3885
revision-id: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
parent: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
parent: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-12-09 16:35:33 +0000
message:
  (jam) Default to urllib for http and pycurl for https
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 3882.2.1
    revision-id: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
    parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: default_urllib
    timestamp: Mon 2008-12-08 13:44:02 -0600
    message:
      Use urllib for http connections, pycurl for https connections.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
=== modified file 'NEWS'
--- a/NEWS	2008-12-09 03:36:14 +0000
+++ b/NEWS	2008-12-09 16:35:33 +0000
@@ -51,6 +51,11 @@
       returned from each pack in turn, in forward I/O order.
       (John Arbash Meinel)
 
+    * The default http handler has been changed from pycurl to urllib.
+      The default is still pycurl for https connections. (The only
+      advantage of pycurl is that it checks ssl certificates.)
+      (John Arbash Meinel)
+
 
 bzr 1.10 2008-12-05
 -------------------

=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2008-12-09 00:51:25 +0000
+++ b/bzrlib/transport/__init__.py	2008-12-09 16:35:33 +0000
@@ -1739,12 +1739,13 @@
                  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 is pycurl if available
+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._urllib',
                         'HttpTransport_urllib')
-register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
-                        'PyCurlTransport')
 register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
                         'PyCurlTransport')