Merge branch '0.24.x'

Conflicts:

	bin/puppetca

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 9d37f2eeb..1227f78dc 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 357a766a1..e0fb5a0ab 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