diff options
| -rw-r--r-- | activeresource/CHANGELOG | 2 | ||||
| -rw-r--r-- | activeresource/lib/active_resource/connection.rb | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG index 46158cb208..7527424070 100644 --- a/activeresource/CHANGELOG +++ b/activeresource/CHANGELOG @@ -1,3 +1,5 @@ +* Don't cache net/http object so that ActiveResource is more thread-safe. Closes #10142 [kou] + * Update XML documentation examples to include explicit type attributes. Closes #9754 [hasmanyjosh] *2.0.0 [Preview Release]* (September 29th, 2007) diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb index 5f86d77a26..46d462dbe7 100644 --- a/activeresource/lib/active_resource/connection.rb +++ b/activeresource/lib/active_resource/connection.rb @@ -127,16 +127,13 @@ module ActiveResource end end - # Creates new (or uses currently instantiated) Net::HTTP instance for communication with + # Creates new Net::HTTP instance for communication with # remote service and resources. def http - unless @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 - end - - @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 end def default_header @@ -157,4 +154,4 @@ module ActiveResource ActiveResource::Base.logger end end -end
\ No newline at end of file +end |