Downgrade net-http 0.7.0 because JRuby is not working

Author: hsbt

lib/rubygems/vendor/net-http/lib/net/http.rb

@@ -724,7 +724,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   class HTTP < Protocol
 
     # :stopdoc:
-    VERSION = "0.8.0"
+    VERSION = "0.7.0"
     HTTPVersion = '1.1'
     begin
       require 'zlib'
@@ -1179,7 +1179,6 @@ def initialize(address, port = nil) # :nodoc:
       @debug_output = options[:debug_output]
       @response_body_encoding = options[:response_body_encoding]
       @ignore_eof = options[:ignore_eof]
-      @tcpsocket_supports_open_timeout = nil
 
       @proxy_from_env = false
       @proxy_uri      = nil
@@ -1322,9 +1321,6 @@ def response_body_encoding=(value)
     # Sets the proxy password;
     # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
     attr_writer :proxy_pass
-
-    # Sets wheter the proxy uses SSL;
-    # see {Proxy Server}[rdoc-ref:Gem::Net::HTTP@Proxy+Server].
     attr_writer :proxy_use_ssl
 
     # Returns the IP address for the connection.
@@ -1636,21 +1632,6 @@ def start  # :yield: http
       self
     end
 
-    # Finishes the \HTTP session:
-    #
-    #   http = Gem::Net::HTTP.new(hostname)
-    #   http.start
-    #   http.started? # => true
-    #   http.finish   # => nil
-    #   http.started? # => false
-    #
-    # Raises IOError if not in a session.
-    def finish
-      raise IOError, 'HTTP session not yet started' unless started?
-      do_finish
-    end
-
-    # :stopdoc:
     def do_start
       connect
       @started = true
@@ -1673,36 +1654,14 @@ def connect
       end
 
       debug "opening connection to #{conn_addr}:#{conn_port}..."
-      begin
-        s =
-          case @tcpsocket_supports_open_timeout
-          when nil, true
-            begin
-              # Use built-in timeout in TCPSocket.open if available
-              sock = TCPSocket.open(conn_addr, conn_port, @local_host, @local_port, open_timeout: @open_timeout)
-              @tcpsocket_supports_open_timeout = true
-              sock
-            rescue ArgumentError => e
-              raise if !(e.message.include?('unknown keyword: :open_timeout') || e.message.include?('wrong number of arguments (given 5, expected 2..4)'))
-              @tcpsocket_supports_open_timeout = false
-
-              # Fallback to Gem::Timeout.timeout if TCPSocket.open does not support open_timeout
-              Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
-                TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
-              }
-            end
-          when false
-            # The current Ruby is known to not support TCPSocket(open_timeout:).
-            # Directly fall back to Gem::Timeout.timeout to avoid performance penalty incured by rescue.
-            Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
-              TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
-            }
-          end
-      rescue => e
-        e = Gem::Net::OpenTimeout.new(e) if e.is_a?(Errno::ETIMEDOUT) # for compatibility with previous versions
-        raise e, "Failed to open TCP connection to " +
-          "#{conn_addr}:#{conn_port} (#{e.message})"
-      end
+      s = Gem::Timeout.timeout(@open_timeout, Gem::Net::OpenTimeout) {
+        begin
+          TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
+        rescue => e
+          raise e, "Failed to open TCP connection to " +
+            "#{conn_addr}:#{conn_port} (#{e.message})"
+        end
+      }
       s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       debug "opened"
       if use_ssl?
@@ -1799,6 +1758,20 @@ def on_connect
     end
     private :on_connect
 
+    # Finishes the \HTTP session:
+    #
+    #   http = Gem::Net::HTTP.new(hostname)
+    #   http.start
+    #   http.started? # => true
+    #   http.finish   # => nil
+    #   http.started? # => false
+    #
+    # Raises IOError if not in a session.
+    def finish
+      raise IOError, 'HTTP session not yet started' unless started?
+      do_finish
+    end
+
     def do_finish
       @started = false
       @socket.close if @socket
@@ -1848,8 +1821,6 @@ def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil, p_use_ss
       }
     end
 
-    # :startdoc:
-
     class << HTTP
       # Returns true if self is a class which was created by HTTP::Proxy.
       def proxy_class?
@@ -1944,7 +1915,6 @@ def proxy_pass
     alias proxyport proxy_port      #:nodoc: obsolete
 
     private
-    # :stopdoc:
 
     def unescape(value)
       require 'cgi/escape'
@@ -1973,7 +1943,6 @@ def edit_path(path)
         path
       end
     end
-    # :startdoc:
 
     #
     # HTTP operations
@@ -2428,8 +2397,6 @@ def send_entity(path, data, initheader, dest, type, &block)
       res
     end
 
-    # :stopdoc:
-
     IDEMPOTENT_METHODS_ = %w/GET HEAD PUT DELETE OPTIONS TRACE/ # :nodoc:
 
     def transport_request(req)
@@ -2587,7 +2554,7 @@ def debug(msg)
     alias_method :D, :debug
   end
 
-  # for backward compatibility until Ruby 4.0
+  # for backward compatibility until Ruby 3.5
   # https://bugs.ruby-lang.org/issues/20900
   # https://github.com/bblimke/webmock/pull/1081
   HTTPSession = HTTP

lib/rubygems/vendor/net-http/lib/net/http/exceptions.rb

@@ -3,7 +3,7 @@ module Gem::Net
   # Gem::Net::HTTP exception class.
   # You cannot use Gem::Net::HTTPExceptions directly; instead, you must use
   # its subclasses.
-  module HTTPExceptions # :nodoc:
+  module HTTPExceptions
     def initialize(msg, res)   #:nodoc:
       super msg
       @response = res
@@ -12,7 +12,6 @@ def initialize(msg, res)   #:nodoc:
     alias data response    #:nodoc: obsolete
   end
 
-  # :stopdoc:
   class HTTPError < ProtocolError
     include HTTPExceptions
   end

lib/rubygems/vendor/net-http/lib/net/http/generic_request.rb

@@ -19,13 +19,16 @@ def initialize(m, reqbody, resbody, uri_or_path, initheader = nil) # :nodoc:
 
     if Gem::URI === uri_or_path then
       raise ArgumentError, "not an HTTP Gem::URI" unless Gem::URI::HTTP === uri_or_path
-      hostname = uri_or_path.host
+      hostname = uri_or_path.hostname
       raise ArgumentError, "no host component for Gem::URI" unless (hostname && hostname.length > 0)
       @uri = uri_or_path.dup
+      host = @uri.hostname.dup
+      host << ":" << @uri.port.to_s if @uri.port != @uri.default_port
       @path = uri_or_path.request_uri
       raise ArgumentError, "no HTTP request path given" unless @path
     else
       @uri = nil
+      host = nil
       raise ArgumentError, "no HTTP request path given" unless uri_or_path
       raise ArgumentError, "HTTP request path is empty" if uri_or_path.empty?
       @path = uri_or_path.dup
@@ -48,7 +51,7 @@ def initialize(m, reqbody, resbody, uri_or_path, initheader = nil) # :nodoc:
     initialize_http_header initheader
     self['Accept'] ||= '*/*'
     self['User-Agent'] ||= 'Ruby'
-    self['Host'] ||= @uri.authority if @uri
+    self['Host'] ||= host if host
     @body = nil
     @body_stream = nil
     @body_data = nil
@@ -242,7 +245,7 @@ def update_uri(addr, port, ssl) # :nodoc: internal use only
     end
 
     if host = self['host']
-      host = Gem::URI.parse("//#{host}").host # Remove a port component from the existing Host header
+      host.sub!(/:.*/m, '')
     elsif host = @uri.host
     else
      host = addr
@@ -261,8 +264,6 @@ def update_uri(addr, port, ssl) # :nodoc: internal use only
 
   private
 
-  # :stopdoc:
-
   class Chunker #:nodoc:
     def initialize(sock)
       @sock = sock

lib/rubygems/vendor/net-http/lib/net/http/header.rb

@@ -179,9 +179,7 @@
 # - #each_value: Passes each string field value to the block.
 #
 module Gem::Net::HTTPHeader
-  # The maximum length of HTTP header keys.
   MAX_KEY_LENGTH = 1024
-  # The maximum length of HTTP header values.
   MAX_FIELD_LENGTH = 65536
 
   def initialize_http_header(initheader) #:nodoc:
@@ -269,7 +267,6 @@ def add_field(key, val)
     end
   end
 
-  # :stopdoc:
   private def set_field(key, val)
     case val
     when Enumerable
@@ -297,7 +294,6 @@ def add_field(key, val)
       ary.push val
     end
   end
-  # :startdoc:
 
   # Returns the array field value for the given +key+,
   # or +nil+ if there is no such field;
@@ -494,7 +490,7 @@ def each_capitalized
 
   alias canonical_each each_capitalized
 
-  def capitalize(name)  # :nodoc:
+  def capitalize(name)
     name.to_s.split('-'.freeze).map {|s| s.capitalize }.join('-'.freeze)
   end
   private :capitalize
@@ -961,20 +957,20 @@ def proxy_basic_auth(account, password)
     @header['proxy-authorization'] = [basic_encode(account, password)]
   end
 
-  def basic_encode(account, password)   # :nodoc:
+  def basic_encode(account, password)
     'Basic ' + ["#{account}:#{password}"].pack('m0')
   end
   private :basic_encode
 
-  # Returns whether the HTTP session is to be closed.
+# Returns whether the HTTP session is to be closed.
   def connection_close?
     token = /(?:\A|,)\s*close\s*(?:\z|,)/i
     @header['connection']&.grep(token) {return true}
     @header['proxy-connection']&.grep(token) {return true}
     false
   end
 
-  # Returns whether the HTTP session is to be kept alive.
+# Returns whether the HTTP session is to be kept alive.
   def connection_keep_alive?
     token = /(?:\A|,)\s*keep-alive\s*(?:\z|,)/i
     @header['connection']&.grep(token) {return true}