httpx 0.18.6 → 0.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6784fbd393b5caed888e6c4d1a421cde9c7aca49f35baaafbf13f10a68e9d02
-  data.tar.gz: ddd5bb8793fa72b19e462b411f5eaaaf553f30d589a68dfdde64224c49d902f6
+  metadata.gz: ab9b9577b0e266b140e21030307b3f2436af346a13f1e0931af05020ba42f7e6
+  data.tar.gz: c5d043448ef41b0532c08d1622540d80c68511ef59cffcc810a6f8bd92f348d5
 SHA512:
-  metadata.gz: 949f18741f10eaa57463b8764569e69cdfb1ca6f4eefa30bbdcf142cbbd8b61b360d9bd78898a816a4ebd9e15d4ffd1c0d8282033a459826919ce8132d5b105f
-  data.tar.gz: e4430eea967c9f5628d51e6150bc4f63e704eaed2bd61fda191f3539a3f102e00932cc8f63ddb735c33bbf21e2694bb23fed5eaea588159e71fa6f484016c150
+  metadata.gz: 8b4ec58f2ab031d23f28a86bc47b40d0f0d79eea9aea64590b0cc3d07269738513de1364608e0c0282a6956d816b78b900520dbad4daab1f73522b8b7f73d138
+  data.tar.gz: f2d2c297b530bfb3567ebcd1678bad1d729187dd75c9107839c925def1a708c4648fe80df614a01af02bce309594e256e274e042f3c6b8347182aebff1df9935

data/doc/release_notes/0_18_5.md

@@ -3,8 +3,8 @@
 ## Improvements
 
 * ruby 3.1 is now officially supported.
-* when user sets a `Host` header for an HTTP/2 request, this will be used in the `:authority` HTTP/2 pseudo-header, instead of silently ignored (mimicking what "curl" does).
+* when a user sets a `Host` header for an HTTP/2 request, this will be used in the `:authority` HTTP/2 pseudo-header, instead of silently ignored (mimicking what "curl" does).
 
 ## Bugfixes
 
-* fixed "throw outside of catch block" error happening when pipelining requests on an HTTP/1 connnection and resulting in a timeout.
+* fixed "throw outside of catch block" error happening when pipelining requests on an HTTP/1 connection and resulting in a timeout.

data/doc/release_notes/0_18_7.md

@@ -0,0 +1,5 @@
+# 0.18.6
+
+## Bugfixes
+
+* multipart plugin: fixed `filemagic` integration by rewinding the file after mime-type detection.

data/lib/httpx/connection/http1.rb

@@ -297,10 +297,6 @@ module HTTPX
       extra_headers
     end
 
-    def headline_uri(request)
-      request.path
-    end
-
     def handle(request)
       catch(:buffer_full) do
         request.transition(:headers)
@@ -314,8 +310,12 @@ module HTTPX
       end
     end
 
+    def join_headline(request)
+      "#{request.verb.to_s.upcase} #{request.path} HTTP/#{@version.join(".")}"
+    end
+
     def join_headers(request)
-      headline = "#{request.verb.to_s.upcase} #{headline_uri(request)} HTTP/#{@version.join(".")}"
+      headline = join_headline(request)
       @buffer << headline << CRLF
       log(color: :yellow) { "<- HEADLINE: #{headline.chomp.inspect}" }
       extra_headers = set_protocol_headers(request)

data/lib/httpx/connection/http2.rb

@@ -158,10 +158,6 @@ module HTTPX
       end
     end
 
-    def headline_uri(request)
-      request.path
-    end
-
     def handle(request, stream)
       catch(:buffer_full) do
         request.transition(:headers)
@@ -213,7 +209,7 @@ module HTTPX
       {
         ":scheme" => request.scheme,
         ":method" => request.verb.to_s.upcase,
-        ":path" => headline_uri(request),
+        ":path" => request.path,
         ":authority" => request.authority,
       }
     end

data/lib/httpx/connection.rb

@@ -44,7 +44,7 @@ module HTTPX
 
     def_delegator :@write_buffer, :empty?
 
-    attr_reader :origin, :state, :pending, :options
+    attr_reader :origin, :origins, :state, :pending, :options
 
     attr_writer :timers
 
@@ -489,6 +489,18 @@ module HTTPX
     end
 
     def transition(nextstate)
+      handle_transition(nextstate)
+   rescue Errno::ECONNREFUSED,
+          Errno::EADDRNOTAVAIL,
+          Errno::EHOSTUNREACH,
+          TLSError => e
+     # connect errors, exit gracefully
+     handle_error(e)
+     @state = :closed
+     emit(:close)
+    end
+
+    def handle_transition(nextstate)
       case nextstate
       when :idle
         @timeout = @current_timeout = @options.timeout[:connect_timeout]
@@ -525,14 +537,6 @@ module HTTPX
         emit(:activate)
       end
       @state = nextstate
-    rescue Errno::ECONNREFUSED,
-           Errno::EADDRNOTAVAIL,
-           Errno::EHOSTUNREACH,
-           TLSError => e
-      # connect errors, exit gracefully
-      handle_error(e)
-      @state = :closed
-      emit(:close)
     end
 
     def purge_after_closed
@@ -550,6 +554,10 @@ module HTTPX
           ex.set_backtrace(error.backtrace)
           error = ex
         else
+          # inactive connections do not contribute to the select loop, therefore
+          # they should fail due to such errors.
+          return if @state == :inactive
+
           if @timeout
             @timeout -= error.timeout
             return unless @timeout <= 0

data/lib/httpx/io/tcp.rb

@@ -57,7 +57,9 @@ module HTTPX
         @io = build_socket
       end
       try_connect
-    rescue Errno::EHOSTUNREACH => e
+    rescue Errno::ECONNREFUSED,
+           Errno::EADDRNOTAVAIL,
+           Errno::EHOSTUNREACH => e
       raise e if @ip_index <= 0
 
       @ip_index -= 1

data/lib/httpx/plugins/internal_telemetry.rb

@@ -81,7 +81,7 @@ module HTTPX
           super
         end
 
-        def transition(nextstate)
+        def handle_transition(nextstate)
           state = @state
           super
           meter_elapsed_time("Connection##{object_id}[#{@origin}]: #{state} -> #{nextstate}") if nextstate == @state

data/lib/httpx/plugins/multipart/mime_type_detector.rb

@@ -14,9 +14,13 @@ module HTTPX
         def call(file, _)
           return nil if file.eof? # FileMagic returns "application/x-empty" for empty files
 
-          FileMagic.open(FileMagic::MAGIC_MIME_TYPE) do |filemagic|
+          mime = FileMagic.open(FileMagic::MAGIC_MIME_TYPE) do |filemagic|
             filemagic.buffer(file.read(MAGIC_NUMBER))
           end
+
+          file.rewind
+
+          mime
         end
       elsif defined?(Marcel)
         def call(file, filename)

data/lib/httpx/plugins/proxy/http.rb

@@ -13,7 +13,7 @@ module HTTPX
 
           private
 
-          def transition(nextstate)
+          def handle_transition(nextstate)
             return super unless @options.proxy && @options.proxy.uri.scheme == "http"
 
             case nextstate
@@ -23,7 +23,8 @@ module HTTPX
               @io.connect
               return unless @io.connected?
 
-              @parser = ConnectProxyParser.new(@write_buffer, @options.merge(max_concurrent_requests: 1))
+              @parser = registry(@io.protocol).new(@write_buffer, @options.merge(max_concurrent_requests: 1))
+              @parser.extend(ProxyParser)
               @parser.once(:response, &method(:__http_on_connect))
               @parser.on(:close) { transition(:closing) }
               __http_proxy_connect
@@ -36,7 +37,7 @@ module HTTPX
                 @parser.close
                 @parser = nil
               when :idle
-                @parser = ProxyParser.new(@write_buffer, @options)
+                @parser.callbacks.clear
                 set_parser_callbacks(@parser)
               end
             end
@@ -54,7 +55,7 @@ module HTTPX
               @inflight += 1
               parser.send(connect_request)
             else
-              transition(:connected)
+              handle_transition(:connected)
             end
           end
 
@@ -76,9 +77,11 @@ module HTTPX
           end
         end
 
-        class ProxyParser < Connection::HTTP1
-          def headline_uri(request)
-            request.uri.to_s
+        module ProxyParser
+          def join_headline(request)
+            return super if request.verb == :connect
+
+            "#{request.verb.to_s.upcase} #{request.uri} HTTP/#{@version.join(".")}"
           end
 
           def set_protocol_headers(request)
@@ -91,22 +94,6 @@ module HTTPX
           end
         end
 
-        class ConnectProxyParser < ProxyParser
-          attr_reader :pending
-
-          def headline_uri(request)
-            return super unless request.verb == :connect
-
-            tunnel = request.path
-            log { "establishing HTTP proxy tunnel to #{tunnel}" }
-            tunnel
-          end
-
-          def empty?
-            @requests.reject { |r| r.verb == :connect }.empty? || @requests.all? { |request| !request.response.nil? }
-          end
-        end
-
         class ConnectRequest < Request
           def initialize(uri, _options)
             super(:connect, uri, {})

data/lib/httpx/plugins/proxy/socks4.rb

@@ -27,7 +27,7 @@ module HTTPX
 
           private
 
-          def transition(nextstate)
+          def handle_transition(nextstate)
             return super unless @options.proxy && PROTOCOLS.include?(@options.proxy.uri.scheme)
 
             case nextstate

data/lib/httpx/plugins/proxy/socks5.rb

@@ -46,7 +46,7 @@ module HTTPX
 
           private
 
-          def transition(nextstate)
+          def handle_transition(nextstate)
             return super unless @options.proxy && @options.proxy.uri.scheme == "socks5"
 
             case nextstate

data/lib/httpx/plugins/proxy.rb

@@ -85,7 +85,7 @@ module HTTPX
             end
             uris
           end
-          options.proxy.merge(uri: @_proxy_uris.first) unless @_proxy_uris.empty?
+          { uri: @_proxy_uris.first } unless @_proxy_uris.empty?
         end
 
         def find_connection(request, connections, options)
@@ -109,8 +109,10 @@ module HTTPX
           return super unless proxy
 
           connection = options.connection_class.new("tcp", uri, options)
-          pool.init_connection(connection, options)
-          connection
+          catch(:coalesced) do
+            pool.init_connection(connection, options)
+            connection
+          end
         end
 
         def fetch_response(request, connections, options)
@@ -181,11 +183,20 @@ module HTTPX
           super && @options.proxy == options.proxy
         end
 
-        # should not coalesce connections here, as the IP is the IP of the proxy
-        def coalescable?(*)
+        def coalescable?(connection)
           return super unless @options.proxy
 
-          false
+          if @io.protocol == "h2" &&
+             @origin.scheme == "https" &&
+             connection.origin.scheme == "https" &&
+             @io.can_verify_peer?
+            # in proxied connections, .origin is the proxy ; Given names
+            # are stored in .origins, this is what is used.
+            origin = URI(connection.origins.first)
+            @io.verify_hostname(origin.host)
+          else
+            @origin == connection.origin
+          end
         end
 
         def send(request)
@@ -234,7 +245,7 @@ module HTTPX
           end
         end
 
-        def transition(nextstate)
+        def handle_transition(nextstate)
           return super unless @options.proxy
 
           case nextstate

data/lib/httpx/resolver/https.rb

@@ -29,7 +29,7 @@ module HTTPX
     attr_writer :pool
 
     def initialize(options)
-      @options = Options.new(options)
+      @options = HTTPX::Options.new(options)
       @resolver_options = DEFAULTS.merge(@options.resolver_options)
       @_record_types = Hash.new { |types, host| types[host] = @resolver_options[:record_types].dup }
       @queries = {}

data/lib/httpx/resolver/native.rb

@@ -50,7 +50,7 @@ module HTTPX
     attr_reader :state
 
     def initialize(options)
-      @options = Options.new(options)
+      @options = HTTPX::Options.new(options)
       @ns_index = 0
       @resolver_options = DEFAULTS.merge(@options.resolver_options)
       @nameserver = @resolver_options[:nameserver]
@@ -200,6 +200,7 @@ module HTTPX
         hostname, connection = @queries.first
         if @_record_types[hostname].empty?
           @queries.delete(hostname)
+          @timeouts.delete(hostname)
           @connections.delete(connection)
           ex = NativeResolveError.new(connection, hostname, e.message)
           ex.set_backtrace(e.backtrace)
@@ -213,6 +214,7 @@ module HTTPX
         if @_record_types[hostname].empty?
           @queries.delete(hostname)
           @_record_types.delete(hostname)
+          @timeouts.delete(hostname)
           @connections.delete(connection)
 
           raise NativeResolveError.new(connection, hostname)
@@ -236,13 +238,18 @@ module HTTPX
         end
 
         if address.key?("alias") # CNAME
-          if early_resolve(connection, hostname: address["alias"])
+          # clean up intermediate queries
+          @timeouts.delete(address["name"]) unless connection.origin.host == address["name"]
+
+          if catch(:coalesced) { early_resolve(connection, hostname: address["alias"]) }
+            @timeouts.delete(connection.origin.host)
             @connections.delete(connection)
           else
             resolve(connection, address["alias"])
             return
           end
         else
+          @timeouts.delete(connection.origin.host)
           @connections.delete(connection)
           Resolver.cached_lookup_set(connection.origin.host, addresses) if @resolver_options[:cache]
           emit_addresses(connection, addresses.map { |addr| addr["data"] })

data/lib/httpx/resolver/resolver_mixin.rb

@@ -32,7 +32,7 @@ module HTTPX
         end
         log { "resolver: answer #{connection.origin.host}: #{addresses.inspect}" }
         connection.addresses = addresses
-        catch(:coalesced) { emit(:resolve, connection) }
+        emit(:resolve, connection)
       end
 
       def early_resolve(connection, hostname: connection.origin.host)

data/lib/httpx/resolver/system.rb

@@ -15,7 +15,7 @@ module HTTPX
     attr_reader :state
 
     def initialize(options)
-      @options = Options.new(options)
+      @options = HTTPX::Options.new(options)
       @resolver_options = @options.resolver_options
       @state = :idle
       resolv_options = @resolver_options.dup

data/lib/httpx/session.rb

@@ -207,7 +207,7 @@ module HTTPX
 
           return responses unless request
 
-          pool.next_tick until (response = fetch_response(request, connections, request.options))
+          catch(:coalesced) { pool.next_tick } until (response = fetch_response(request, connections, request.options))
 
           responses << response
           requests.shift
@@ -309,18 +309,4 @@ module HTTPX
       # :nocov:
     end
   end
-
-  unless ENV.grep(/https?_proxy$/i).empty?
-    proxy_session = plugin(:proxy)
-    ::HTTPX.send(:remove_const, :Session)
-    ::HTTPX.send(:const_set, :Session, proxy_session.class)
-  end
-
-  # :nocov:
-  if Session.default_options.debug_level > 2
-    proxy_session = plugin(:internal_telemetry)
-    ::HTTPX.send(:remove_const, :Session)
-    ::HTTPX.send(:const_set, :Session, proxy_session.class)
-  end
-  # :nocov:
 end

data/lib/httpx/session_extensions.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module HTTPX
+  unless ENV.keys.grep(/\Ahttps?_proxy\z/i).empty?
+    proxy_session = plugin(:proxy)
+    remove_const(:Session)
+    const_set(:Session, proxy_session.class)
+    remove_const(:Options)
+    const_set(:Options, proxy_session.class.default_options.class)
+  end
+
+  # :nocov:
+  if Session.default_options.debug_level > 2
+    proxy_session = plugin(:internal_telemetry)
+    remove_const(:Session)
+    const_set(:Session, proxy_session.class)
+  end
+  # :nocov:
+end

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.18.6"
+  VERSION = "0.18.7"
 end

data/lib/httpx.rb

@@ -64,3 +64,4 @@ module HTTPX
 end
 
 require "httpx/session"
+require "httpx/session_extensions"

data/sig/connection/http1.rbs

@@ -67,8 +67,6 @@ module HTTPX
 
     def set_protocol_headers: (Request) -> _Each[[String, String]]
 
-    def headline_uri: (Request) -> String
-
     def handle: (Request request) -> void
 
     def join_headers: (Request request) -> void

data/sig/connection/http2.rbs

@@ -46,8 +46,6 @@ module HTTPX
 
     def send_pending: () -> void
 
-    def headline_uri: (Request) -> String
-
     def set_protocol_headers: (Request) -> _Each[[String, String]]
 
     def handle: (Request request, HTTP2Next::Stream stream) -> void
@@ -56,6 +54,8 @@ module HTTPX
 
     def handle_stream: (HTTP2Next::Stream stream, Request request) -> void
 
+    def join_headline: (Request request) -> String
+
     def join_headers: (HTTP2Next::Stream stream, Request request) -> void
 
     def join_trailers: (HTTP2Next::Stream stream, Request request) -> void

data/sig/connection.rbs

@@ -22,6 +22,7 @@ module HTTPX
     BUFFER_SIZE: Integer
 
     attr_reader origin: URI::Generic
+    attr_reader origins: Array[String]
     attr_reader state: Symbol
     attr_reader pending: Array[Request]
     attr_reader options: Options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.18.6
+  version: 0.18.7
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -69,6 +69,7 @@ extra_rdoc_files:
 - doc/release_notes/0_18_4.md
 - doc/release_notes/0_18_5.md
 - doc/release_notes/0_18_6.md
+- doc/release_notes/0_18_7.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -131,6 +132,7 @@ files:
 - doc/release_notes/0_18_4.md
 - doc/release_notes/0_18_5.md
 - doc/release_notes/0_18_6.md
+- doc/release_notes/0_18_7.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -234,6 +236,7 @@ files:
 - lib/httpx/selector.rb
 - lib/httpx/session.rb
 - lib/httpx/session2.rb
+- lib/httpx/session_extensions.rb
 - lib/httpx/timers.rb
 - lib/httpx/transcoder.rb
 - lib/httpx/transcoder/body.rb