* lib/rubygems: Import RubyGems from master as of commit b165260

* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb
index 60e31838f9..b2e9dbc679 100644
--- a/lib/rubygems/request.rb
+++ b/lib/rubygems/request.rb
@@ -1,4 +1,5 @@
 require 'net/http'
+require 'thread'
 require 'time'
 require 'rubygems/user_interaction'
 
@@ -14,6 +15,7 @@ class Gem::Request
     @last_modified = last_modified
     @requests = Hash.new 0
     @connections = {}
+    @connections_mutex = Mutex.new
     @user_agent = user_agent
 
     @proxy_uri =
@@ -82,8 +84,11 @@ class Gem::Request
     end
 
     connection_id = [Thread.current.object_id, *net_http_args].join ':'
-    @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
-    connection = @connections[connection_id]
+
+    connection = @connections_mutex.synchronize do
+      @connections[connection_id] ||= Net::HTTP.new(*net_http_args)
+      @connections[connection_id]
+    end
 
     if https?(uri) and not connection.started? then
       configure_connection_for_https(connection)