Rev 2183: Respect proxy environment settings (Vincent Ladeuil, #74759) in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Dec 13 16:23:55 GMT 2006
------------------------------------------------------------
revno: 2183
revision-id: pqm at pqm.ubuntu.com-20061213162352-0de9ae3d8d38f95d
parent: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
parent: abentley at panoramicfeedback.com-20061213150839-plz4yi4zi343vkzf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-12-13 16:23:52 +0000
message:
Respect proxy environment settings (Vincent Ladeuil, #74759)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061213150839-plz4yi4zi343vkzf
parent: pqm at pqm.ubuntu.com-20061213093630-54b3c40eb877cfd0
parent: v.ladeuil+lp at free.fr-20061212140459-g808yc2gxsavjvx9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Wed 2006-12-13 10:08:39 -0500
message:
Respect proxy environment settings (Vincent Ladeuil, #74759)
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061212140459-g808yc2gxsavjvx9
parent: v.ladeuil+lp at free.fr-20061212124955-1b8m2zk2tt54l869
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Tue 2006-12-12 15:04:59 +0100
message:
Typos corrected.
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061212124955-1b8m2zk2tt54l869
parent: v.ladeuil+lp at free.fr-20061211132455-e8k81db8ktfwvrlz
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Tue 2006-12-12 13:49:55 +0100
message:
Take John's comments into account and add more tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.get_proxy_env_var): Default to all_proxy if specific
env var is not found.
* bzrlib/tests/test_http.py:
Redesign the tests to be able to test for uppercased envrinoment
variables and all_proxy.
(TestProxyHttpServer.setUp): Initialize some attributes shared by
all tests.
(TestProxyHttpServer_pycurl.setUp): Specialized no_proxy for
pycurl and skip some tests.
* bzrlib/tests/__init__.py:
(TestCase._cleanEnvironment): Includes all proxy related
variables.
* bzrlib/tests/HttpServer.py:
(HttpServer._get_remote_url): No need to check for server thread
initialization here, we do that in setUp now.
(HttpServer.setUp): Explicitely waits for server thread
initialization or weird timing-related bugs occur in the test
suite.
(HttpServer.setUp, HttpServer.tearDown): Leave environment
handling to bzr.tests.TestCase._cleanEnvironment.
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061211132455-e8k81db8ktfwvrlz
parent: v.ladeuil+lp at free.fr-20061208164433-bwgtu6ltefmmpfzi
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Mon 2006-12-11 14:24:55 +0100
message:
Tests for proxies, covering #74759.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.proxy_bypass): Matches against the modified regexp,
not the original domain.
* bzrlib/tests/test_http.py:
(TestProxyHttpServer, TestProxyHttpServer_urllib,
TestProxyHttpServer_pycurl): New classes for proxy tests.
* bzrlib/tests/HttpServer.py:
(HttpServer._http_start): Give access to the port used by the
server socket.
(HttpServer.setUp, HttpServer.tearDown): Handles the 'no_proxy'
env var too.
* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithTwoWebservers): New class for tests needing two
related web servers.
(FakeProxyRequestHandler): New class to fake a proxy http server.
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061208164433-bwgtu6ltefmmpfzi
parent: v.ladeuil+lp at free.fr-20061208101841-pqp1yn2viwkdem6y
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Fri 2006-12-08 17:44:33 +0100
message:
Better fix for #74759, but still not tests.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.proxy_bypass): New method to check if a given host is
proxied or not.
(ProxyHandler.set_proxy): Check no_proxy too.
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061208101841-pqp1yn2viwkdem6y
parent: v.ladeuil+lp at free.fr-20061207171150-ga15euunhfrcpkw5
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Fri 2006-12-08 11:18:41 +0100
message:
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler.__init__): Reworked to handle the no_proxy env
var. Note that the urllib2 implementation is buggy (it ignores the
no_proxy). This third patch still not fix this issue, it only
ignores no_proxy too ;)
(ProxyHandler.get_proxy): New accessor.
(ProxyHandler.set_proxy): Renamed from set_request_proxy.
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061207171150-ga15euunhfrcpkw5
parent: v.ladeuil+lp at free.fr-20061207125916-iaobw8yr8t6p071z
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Thu 2006-12-07 18:11:50 +0100
message:
* bzrlib/transport/http/_urllib2_wrappers.py
(ProxyHandler.set_request_proxy): Fix base64 by Jonh's remark.
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20061207125916-iaobw8yr8t6p071z
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
committer: v.ladeuil+lp at free.fr
branch nick: bzr.74759
timestamp: Thu 2006-12-07 13:59:16 +0100
message:
Fix bug #74759.
* bzrlib/transport/http/_urllib2_wrappers.py:
(ProxyHandler): Properly set the proxy before trying to open the
connection if any proxy is set.
(Opener.__init__): Use our ProxyHandler.
More information about the bazaar-commits
mailing list