summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/http_pool.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/network/http_pool.rb')
-rw-r--r--lib/puppet/network/http_pool.rb5
1 files changed, 3 insertions, 2 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