[rubygems/rubygems] Keep compatiblity for RG 3.5

https://github.com/rubygems/rubygems/commit/d004e36c44

2 files changed, 12 insertions, 4 deletions

diff --git a/lib/bundler/vendored_net_http.rb b/lib/bundler/vendored_net_http.rb
index 59f234a758..0dcabaa7d7 100644
--- a/lib/bundler/vendored_net_http.rb
+++ b/lib/bundler/vendored_net_http.rb
@@ -3,6 +3,10 @@
 begin
   require "rubygems/vendored_net_http"
 rescue LoadError
-  require "net/http"
-  Gem::Net = Net
+  begin
+    require "rubygems/net/http"
+  rescue LoadError
+    require "net/http"
+    Gem::Net = Net
+  end
 end
diff --git a/lib/bundler/vendored_timeout.rb b/lib/bundler/vendored_timeout.rb
index 0be3d802fd..9b2507c0cc 100644
--- a/lib/bundler/vendored_timeout.rb
+++ b/lib/bundler/vendored_timeout.rb
@@ -3,6 +3,10 @@
 begin
   require "rubygems/vendored_timeout"
 rescue LoadError
-  require "timeout"
-  Gem::Timeout = Timeout
+  begin
+    require "rubygems/timeout"
+  rescue LoadError
+    require "timeout"
+    Gem::Timeout = Timeout
+  end
 end