summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/defaults.rb3
-rw-r--r--lib/puppet/network/http_pool.rb2
2 files changed, 0 insertions, 5 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 21cee7a05..d4a5a189d 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -159,9 +159,6 @@ module Puppet
may need to use a FQDN for the server hostname when using a proxy."],
:http_proxy_port => [3128,
"The HTTP proxy port to use for outgoing connections"],
- :http_enable_post_connection_check => [true,
- "Boolean; whether or not puppetd should validate the server
- SSL certificate against the request hostname."],
:filetimeout => [ 15,
"The minimum time to wait (in seconds) between checking for updates in
configuration files. This timeout determines how quickly Puppet checks whether
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 6de204a80..4789d4704 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -94,8 +94,6 @@ module Puppet::Network::HttpPool
# Use configured timeout (#1176)
http.read_timeout = Puppet[:configtimeout]
http.open_timeout = Puppet[:configtimeout]
- # JJM Configurable fix for #896.
- http.enable_post_connection_check = Puppet[:http_enable_post_connection_check]
cert_setup(http)