diff --git a/lib/rubygems/vendor/net-http/lib/net/http.rb b/lib/rubygems/vendor/net-http/lib/net/http.rb index 6e9c7c0711116b..e32067e49fe34d 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 @@ class HTTPHeaderSyntaxError < StandardError; end class HTTP < Protocol # :stopdoc: - VERSION = "0.5.0" + VERSION = "0.6.0" HTTPVersion = '1.1' begin require 'zlib' @@ -2559,6 +2559,11 @@ def debug(msg) 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 @@ def debug(msg) 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 10dbc162247202..00000000000000 --- 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 diff --git a/tool/bundler/vendor_gems.rb b/tool/bundler/vendor_gems.rb index 7e9a9bf2a0c93c..1c5b1bc7ccd6f3 100644 --- a/tool/bundler/vendor_gems.rb +++ b/tool/bundler/vendor_gems.rb @@ -4,7 +4,7 @@ gem "fileutils", "1.7.3" gem "molinillo", github: "cocoapods/molinillo" -gem "net-http", "0.5.0" +gem "net-http", "0.6.0" gem "net-http-persistent", "4.0.4" gem "net-protocol", "0.2.2" gem "optparse", "0.6.0"