Rev 3278: (Jeff Abbott) Fix bzr+https:// in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3278
revision-id:pqm at pqm.ubuntu.com-20080314225929-4y11nn6gml5qfzz1
parent: pqm at pqm.ubuntu.com-20080314211658-bjlcjsk0zl2ppcai
parent: fdiv_bug at sniping.org-20080305154827-wi2v4a73t1yob23c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-03-14 22:59:29 +0000
message:
  (Jeff Abbott) Fix bzr+https://
modified:
  bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
    ------------------------------------------------------------
    revno: 3251.4.1
    revision-id:fdiv_bug at sniping.org-20080305154827-wi2v4a73t1yob23c
    parent: pqm at pqm.ubuntu.com-20080305131343-toq33x607hecihie
    committer: Jeff Abbott <fdiv_bug at sniping.org>
    branch nick: https-fix
    timestamp: Wed 2008-03-05 10:48:27 -0500
    message:
      Applied John's proposed fix (from https://lists.ubuntu.com/archives/bazaar/2008q1/037864.html).
    modified:
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
=== modified file 'bzrlib/smart/client.py'
--- a/bzrlib/smart/client.py	2008-01-24 03:21:43 +0000
+++ b/bzrlib/smart/client.py	2008-03-05 15:48:27 +0000
@@ -87,7 +87,8 @@
         anything but path, so it is only safe to use it in requests sent over
         the medium from the matching transport.
         """
-        if self._shared_connection.base.startswith('bzr+http://'):
+        base = self._shared_connection.base
+        if base.startswith('bzr+http://') or base.startswith('bzr+https://'):
             medium_base = self._shared_connection.base
         else:
             medium_base = urlutils.join(self._shared_connection.base, '/')

=== modified file 'bzrlib/transport/http/_urllib.py'
--- a/bzrlib/transport/http/_urllib.py	2007-12-20 16:36:44 +0000
+++ b/bzrlib/transport/http/_urllib.py	2008-03-05 15:48:27 +0000
@@ -48,6 +48,7 @@
             self._opener = _from_transport._opener
         else:
             self._opener = self._opener_class()
+        self._remote_is_at_least_1_2 = True
 
     def _perform(self, request):
         """Send the request to the server and handles common errors.