# Bazaar revision bundle v0.8
#
# message:
#   Fix bug #83954.
#   
#   * bzrlib/transport/http/_urllib2_wrappers.py:
#   (ProxyHandler.set_proxy): Fix untested typo. (Bug #83594).
#   
#   * bzrlib/tests/test_http.py:
#   (TestProxyHttpServer): Add a FIXME to test proxy authorization
#   schemes once they become available in the test framework (already
#   in progress in another branch).
#   
# committer: v.ladeuil+lp@free.fr
# date: Thu 2007-02-08 13:33:13.869999886 +0100

=== modified file NEWS
--- NEWS
+++ NEWS
@@ -76,6 +76,10 @@
       the ``--use-existing-dir`` flag.
       (John Arbash Meinel, #30576, #45504)
 
+    * Lack of http authorization support in test framework, a
+      typo in prroxy handling have been unnoticed. (Vincent
+      Ladeuil, #83954).
+
   TESTING:
 
     * New ``--first`` option to ``bzr selftest`` to run specified tests

=== modified file bzrlib/tests/test_http.py
--- bzrlib/tests/test_http.py
+++ bzrlib/tests/test_http.py
@@ -655,6 +655,10 @@
     # FIXME: We don't have an https server available, so we don't
     # test https connections.
 
+    # FIXME: Once the test suite is better fitted to test
+    # authorization schemes, test proxy authorizations too (see
+    # bug #83954).
+
     def setUp(self):
         TestCaseWithTwoWebservers.setUp(self)
         self.build_tree_contents([('foo', 'contents of foo\n'),

=== modified file bzrlib/transport/http/_urllib2_wrappers.py
--- bzrlib/transport/http/_urllib2_wrappers.py
+++ bzrlib/transport/http/_urllib2_wrappers.py
@@ -711,7 +711,7 @@
                 user_pass = '%s:%s' % (urllib.unquote(user),
                                urllib.unquote(password))
                 user_pass.encode('base64').strip()
-                req.add_header('Proxy-authorization', 'Basic ' + user_pass)
+                request.add_header('Proxy-authorization', 'Basic ' + user_pass)
         host = urllib.unquote(host)
         request.set_proxy(host, type)
         if self._debuglevel > 0:

=== modified directory  // last-changed:v.ladeuil+lp@free.fr-20070208123313-22f
... cfuoj7g2j0x0o
# revision id: v.ladeuil+lp@free.fr-20070208123313-22fcfuoj7g2j0x0o
# sha1: 8ecd4672eec69887d87641464df88b3f580357cf
# inventory sha1: 495e918f91984fff4f589ff3f5541baf26ac01aa
# parent ids:
#   pqm@pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
# base id: pqm@pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
# properties:
#   branch-nick: bzr.83954