diff options
| author | Markus Roberts <Markus@reality.com> | 2010-09-28 12:14:09 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-09-28 20:22:50 -0700 |
| commit | eb9279c69d74f1a86a79df9319eab42fefe308ee (patch) | |
| tree | 2cd50bbd050133dabd3475e1a8f723ab7f3a00cc /lib/puppet | |
| parent | 53a2bea4ddad0a9f0d537fd8833a437ed2376889 (diff) | |
| download | puppet-eb9279c69d74f1a86a79df9319eab42fefe308ee.tar.gz puppet-eb9279c69d74f1a86a79df9319eab42fefe308ee.tar.xz puppet-eb9279c69d74f1a86a79df9319eab42fefe308ee.zip | |
Fix for 4273 -- revert b7e2580ab49ecdb67fc9b522829c005fc3750fbe
The debugging information added in commit b7e2580ab49ecdb67fc9b522829c005fc3750fbe
was not thread safe and, as it turns out, not as useful as had been hoped. This
commit reverts it.
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/network/http_pool.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb index a3b055572..7d227b4d4 100644 --- a/lib/puppet/network/http_pool.rb +++ b/lib/puppet/network/http_pool.rb @@ -58,18 +58,6 @@ module Puppet::Network::HttpPool http.cert = ssl_host.certificate.content http.verify_mode = OpenSSL::SSL::VERIFY_PEER http.key = ssl_host.key.content - http.verify_callback = self.method(:ssl_verify_callback).to_proc if Puppet[:debug] - end - - def self.ssl_verify_callback(peer_ok, x509_store_ctx) - if not peer_ok - Puppet.debug "OpenSSL: Error(#{x509_store_ctx.error}): #{x509_store_ctx.error_string}" - Puppet.debug "OpenSSL: Cert: #{x509_store_ctx.current_cert.issuer}" - Puppet.debug "OpenSSL: Current CRL: #{x509_store_ctx.current_crl}" - Puppet.debug "OpenSSL: Chain:" - x509_store_ctx.chain.each_index { |i| Puppet.debug "OpenSSL: \t#{i} #{x509_store_ctx.chain[i].issuer}" } - end - peer_ok end # Retrieve a cached http instance if caching is enabled, else return |