From 8a7fe9fedfcf67f9415a2ecf7fd74f6032d39d8b Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Sun, 8 Jul 2007 23:57:56 +0000
Subject: Applying patch by David Schmitt from #701.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2661 980ebf18-57e1-0310-9a29-db15c13687c0
---
 lib/puppet/network/xmlrpc/client.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/puppet/network/xmlrpc')

diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index 38f40a827..606aa0019 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -99,6 +99,13 @@ module Puppet::Network
             hash[:Path] ||= "/RPC2"
             hash[:Server] ||= Puppet[:server]
             hash[:Port] ||= Puppet[:masterport]
+            hash[:HTTPProxyHost] ||= Puppet[:http_proxy_host]
+            hash[:HTTPProxyPort] ||= Puppet[:http_proxy_port]
+
+            if "none" == hash[:HTTPProxyHost]
+                hash[:HTTPProxyHost] = nil
+                hash[:HTTPProxyPort] = nil
+            end
 
             @puppet_server = hash[:Server]
             @puppet_port = hash[:Port]
@@ -107,8 +114,8 @@ module Puppet::Network
                 hash[:Server],
                 hash[:Path],
                 hash[:Port],
-                nil, # proxy_host
-                nil, # proxy_port
+                hash[:HTTPProxyHost], # proxy_host
+                hash[:HTTPProxyPort], # proxy_port
                 nil, # user
                 nil, # password
                 true, # use_ssl
-- 
cgit