Permalink
Browse files

Don't set ssl_timeout for Net::HTTP in jruby

  • Loading branch information...
1 parent 1850e8b commit b5213286ae10f280f1d7b82306e3c7b829cf813b @bblimke committed Mar 16, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 spec/acceptance/net_http/net_http_spec_helper.rb
@@ -23,7 +23,7 @@ def http_request(method, uri, options = {}, &block)
if uri.scheme == "https"
http.use_ssl = true
#1.9.1 has a bug with ssl_timeout
- http.ssl_timeout = 20 if http.respond_to?("ssl_timeout=")
+ http.ssl_timeout = 20 unless RUBY_PLATFORM =~ /java/
http.open_timeout = 60
http.read_timeout = 60
end

0 comments on commit b521328

Please sign in to comment.