[rubygems/rubygems] Keep compatiblity for RG 3.5

rubygems/rubygems@d004e36c44
ruby · Feb 26, 2024 · c342726 · c342726
1 parent 8b22198
commit c342726
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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