aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib
diff options
context:
space:
mode:
authorBrendan Schwartz <brendanschwartz@gmail.com>2009-03-25 15:14:52 -0400
committerJeremy Kemper <jeremy@bitsweat.net>2009-08-07 12:24:02 -0700
commit201387496e057d4853520be9837b2a807c66cc48 (patch)
tree1c391021501104fb109af4b2a80b546328a014ad /activeresource/lib
parent06afa48c8c7bb7bf75f9e7ae48e06528f8ff82ed (diff)
downloadrails-201387496e057d4853520be9837b2a807c66cc48.tar.gz
rails-201387496e057d4853520be9837b2a807c66cc48.tar.bz2
rails-201387496e057d4853520be9837b2a807c66cc48.zip
Ruby 1.9 compat: fix for SSL in Active Resource
[#1272 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activeresource/lib')
-rw-r--r--activeresource/lib/active_resource/connection.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index fb3fde59d6..99d4b8f2ca 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -134,7 +134,7 @@ module ActiveResource
def http
http = Net::HTTP.new(@site.host, @site.port)
http.use_ssl = @site.is_a?(URI::HTTPS)
- http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl
+ http.verify_mode = OpenSSL::SSL::VERIFY_NONE if http.use_ssl?
http.read_timeout = @timeout if @timeout # If timeout is not set, the default Net::HTTP timeout (60s) is used.
http
end