+1.  Looks like a very safe fix.

On Tue, Sep 28, 2010 at 12:17 PM, Markus Roberts <[email protected]> wrote:

> 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.
>
> Signed-off-by: Markus Roberts <[email protected]>
> ---
>  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 a3b0555..7d227b4 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
> --
> 1.7.0.4
>
> --
> You received this message because you are subscribed to the Google Groups
> "Puppet Developers" group.
> To post to this group, send email to [email protected].
> To unsubscribe from this group, send email to
> [email protected]<puppet-dev%[email protected]>
> .
> For more options, visit this group at
> http://groups.google.com/group/puppet-dev?hl=en.
>
>

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to