diff options
| author | Luke Kanies <luke@madstop.com> | 2007-11-27 17:32:32 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-11-27 17:32:32 -0600 |
| commit | 30547c93050a958b289fe1c85b76bb2dc5ae4048 (patch) | |
| tree | 279820ada59bed04966f33bea61e41a3d68fbff5 /lib/puppet/network | |
| parent | 0ef6b9579df65adda51389a2ab3e514ef42afa14 (diff) | |
| parent | 36c947ecae1b0082cf535dc691891b6cd7bf2c51 (diff) | |
| download | puppet-30547c93050a958b289fe1c85b76bb2dc5ae4048.tar.gz puppet-30547c93050a958b289fe1c85b76bb2dc5ae4048.tar.xz puppet-30547c93050a958b289fe1c85b76bb2dc5ae4048.zip | |
Merge commit 'mccune/pending/fix-896r2'
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb index fa48ebfb5..52431e227 100644 --- a/lib/puppet/network/client.rb +++ b/lib/puppet/network/client.rb @@ -19,6 +19,12 @@ class Net::HTTP false end end + + # JJM: This is a "backport" of sorts to older ruby versions which + # do not have this accessor. See #896 for more information. + unless Net::HTTP.instance_methods.include? "enable_post_connection_check" + attr_accessor :enable_post_connection_check + end end # The base class for all of the clients. Many clients just directly diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index 39f149aa8..371648b61 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -147,6 +147,7 @@ module Puppet::Network @http.cert = client.cert @http.verify_mode = OpenSSL::SSL::VERIFY_PEER @http.key = client.key + @http.enable_post_connection_check = false end end |