Bump vendored net-http to 0.6.0

2 files changed, 6 insertions, 43 deletions

diff --git a/lib/rubygems/vendor/net-http/lib/net/http.rb b/lib/rubygems/vendor/net-http/lib/net/http.rb
index 6e9c7c0711..e32067e49f 100644
--- a/lib/rubygems/vendor/net-http/lib/net/http.rb
+++ b/lib/rubygems/vendor/net-http/lib/net/http.rb
@@ -730,7 +730,7 @@ module Gem::Net   #:nodoc:
   class HTTP < Protocol
 
     # :stopdoc:
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
     HTTPVersion = '1.1'
     begin
       require 'zlib'
@@ -2559,6 +2559,11 @@ module Gem::Net   #:nodoc:
     alias_method :D, :debug
   end
 
+  # for backward compatibility until Ruby 3.5
+  # https://bugs.ruby-lang.org/issues/20900
+  # https://github.com/bblimke/webmock/pull/1081
+  HTTPSession = HTTP
+  deprecate_constant :HTTPSession
 end
 
 require_relative 'http/exceptions'
@@ -2573,5 +2578,3 @@ require_relative 'http/response'
 require_relative 'http/responses'
 
 require_relative 'http/proxy_delta'
-
-require_relative 'http/backward'
diff --git a/lib/rubygems/vendor/net-http/lib/net/http/backward.rb b/lib/rubygems/vendor/net-http/lib/net/http/backward.rb
deleted file mode 100644
index 10dbc16224..0000000000
--- a/lib/rubygems/vendor/net-http/lib/net/http/backward.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-# for backward compatibility
-
-# :enddoc:
-
-class Gem::Net::HTTP
-  ProxyMod = ProxyDelta
-  deprecate_constant :ProxyMod
-end
-
-module Gem::Net::NetPrivate
-  HTTPRequest = ::Gem::Net::HTTPRequest
-  deprecate_constant :HTTPRequest
-end
-
-module Gem::Net
-  HTTPSession = HTTP
-
-  HTTPInformationCode  = HTTPInformation
-  HTTPSuccessCode      = HTTPSuccess
-  HTTPRedirectionCode  = HTTPRedirection
-  HTTPRetriableCode    = HTTPRedirection
-  HTTPClientErrorCode  = HTTPClientError
-  HTTPFatalErrorCode   = HTTPClientError
-  HTTPServerErrorCode  = HTTPServerError
-  HTTPResponseReceiver = HTTPResponse
-
-  HTTPResponceReceiver = HTTPResponse # Typo since 2001
-
-  deprecate_constant :HTTPSession,
-                     :HTTPInformationCode,
-                     :HTTPSuccessCode,
-                     :HTTPRedirectionCode,
-                     :HTTPRetriableCode,
-                     :HTTPClientErrorCode,
-                     :HTTPFatalErrorCode,
-                     :HTTPServerErrorCode,
-                     :HTTPResponseReceiver,
-                     :HTTPResponceReceiver
-end