[Inteproxy-commits] r121 - in trunk: . inteproxy

[scm-commit@wald.intevation.org]

Author: bh
Date: 2008-04-16 14:46:13 +0200 (Wed, 16 Apr 2008)
New Revision: 121

Modified:
   trunk/ChangeLog
   trunk/inteproxy/main.py
Log:
* inteproxy/main.py: Use the https_proxy only for HTTPS
connections.  For HTTP connections, use http_proxy, which is
automatically handled by urllib2.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-27 20:11:34 UTC (rev 120)
+++ trunk/ChangeLog	2008-04-16 12:46:13 UTC (rev 121)
@@ -1,3 +1,9 @@
+2008-04-16  Bernhard Herzog  <bh at intevation.de>
+
+	* inteproxy/main.py: Use the https_proxy only for HTTPS
+	connections.  For HTTP connections, use http_proxy, which is
+	automatically handled by urllib2.
+
 2008-02-27  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
 
 	* website/Makefile: Fixed dependency.

Modified: trunk/inteproxy/main.py
===================================================================
--- trunk/inteproxy/main.py	2008-02-27 20:11:34 UTC (rev 120)
+++ trunk/inteproxy/main.py	2008-04-16 12:46:13 UTC (rev 121)
@@ -1,5 +1,5 @@
 #! /usr/bin/python
-# Copyright (C) 2006, 2007 by Intevation GmbH
+# Copyright (C) 2006, 2007, 2008 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -53,11 +53,9 @@
         del os.environ['https_proxy']
         sys.stderr.write("[%s] Using HTTPS proxy: %s\n"
                          % (log_date_time_string(), https_proxy))
-        handlers.extend((
-            proxyconnection.ConnectHTTPHandler(proxy=https_proxy,
-                                               debuglevel=debuglevel),
-            proxyconnection.ConnectHTTPSHandler(proxy=https_proxy,
-                                                debuglevel=debuglevel)))
+        proxy_handler = proxyconnection.ConnectHTTPSHandler(proxy=https_proxy,
+                                                            debuglevel=debuglevel)
+        handlers.append(proxy_handler)
     else:
         httphandler = urllib2.HTTPHandler(debuglevel=debuglevel)
         httpshandler = urllib2.HTTPSHandler(debuglevel=debuglevel)