[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 546130d929ce2f82cb074e440993749e74d1f8b4

[Micah Anderson]

The following commit has been merged in the master branch:
commit 50c668e8e3115717de98775bf8f510081eba5211
Author: Micah Anderson <micah at riseup.net>
Date:   Sun Apr 13 19:15:06 2008 -0400

    Added patch from ticket #1176 to make configtimeout option work correctly as a command-line
    switch, as well as a configuration file option

diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 9d37f2e..1227f78 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -88,8 +88,9 @@ module Puppet::Network::HttpPool
         class << http; attr_accessor :ca_file; end
 
         http.use_ssl = true
-        http.read_timeout = 120
-        http.open_timeout = 120
+        # Use configured timeout (#1176)
+        http.read_timeout = Puppet[:configtimeout]
+        http.open_timeout = Puppet[:configtimeout]
         # JJM Configurable fix for #896.
         if Puppet[:http_enable_post_connection_check]
             http.enable_post_connection_check = true
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index 357a766..e0fb5a0 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -123,7 +123,7 @@ module Puppet::Network
                 nil, # user
                 nil, # password
                 true, # use_ssl
-                120 # a two minute timeout, instead of 30 seconds
+                Puppet[:configtimeout] # use configured timeout (#1176)
             )
             @http = Puppet::Network::HttpPool.http_instance(@host, @port)
         end

-- 
Puppet packaging for Debian