diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2009-12-29 13:31:35 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-01-30 09:33:59 +1100 |
| commit | b473264fe76f92b8eddeed7175c4283c9f8484d2 (patch) | |
| tree | 9ddf450942fb4d692ff248c071034c9edb4ed940 /lib | |
| parent | 9419c2ba9553d2ed88e7435ea7becc0783024af2 (diff) | |
| download | puppet-b473264fe76f92b8eddeed7175c4283c9f8484d2.tar.gz puppet-b473264fe76f92b8eddeed7175c4283c9f8484d2.tar.xz puppet-b473264fe76f92b8eddeed7175c4283c9f8484d2.zip | |
Fix #1842 Net::HTTP#enable_post_connection_check doesn't work anymore
The setting enable_post_connection_check doesn't exist on very many
versions of ruby, and on those systems there's no way to disable domain
name checking on HTTPS.
The recommended work-around is to replace certificates when they have
incorrect hostnames.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/defaults.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/network/http_pool.rb | 2 |
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) |