httpx 0.21.0 → 0.22.4

data/lib/httpx/adapters/sentry.rb

@@ -63,7 +63,11 @@ module HTTPX::Plugins
 
         request_info = extract_request_info(req)
         sentry_span.set_description("#{request_info[:method]} #{request_info[:url]}")
-        sentry_span.set_data(:status, res.status)
+        if res.is_a?(HTTPX::ErrorResponse)
+          sentry_span.set_data(:error, res.message)
+        else
+          sentry_span.set_data(:status, res.status)
+        end
         sentry_span.set_timestamp(::Sentry.utc_now.to_f)
       end
 
@@ -95,7 +99,7 @@ module HTTPX::Plugins
 end
 
 Sentry.register_patch do
-  sentry_session = ::HTTPX.plugin(HTTPX::Plugins::Sentry)
+  sentry_session = HTTPX.plugin(HTTPX::Plugins::Sentry)
 
   HTTPX.send(:remove_const, :Session)
   HTTPX.send(:const_set, :Session, sentry_session.class)

data/lib/httpx/connection/http2.rb

@@ -365,7 +365,7 @@ module HTTPX
         ex.set_backtrace(caller)
         handle_error(ex)
       end
-      return unless is_connection_closed && @streams.size.zero?
+      return unless is_connection_closed && @streams.empty?
 
       emit(:close, is_connection_closed)
     end

data/lib/httpx/connection.rb

@@ -45,10 +45,12 @@ module HTTPX
 
     def_delegator :@write_buffer, :empty?
 
-    attr_reader :io, :origin, :origins, :state, :pending, :options
+    attr_reader :type, :io, :origin, :origins, :state, :pending, :options
 
     attr_writer :timers
 
+    attr_accessor :family
+
     def initialize(type, uri, options)
       @type = type
       @origins = [uri.origin]
@@ -114,7 +116,10 @@ module HTTPX
 
       return false unless connection.addresses
 
-      !(@io.addresses & connection.addresses).empty? && @options == connection.options
+      (
+        (open? && @origin == connection.origin) ||
+        !(@io.addresses & connection.addresses).empty?
+      ) && @options == connection.options
     end
 
     # coalescable connections need to be mergeable!
@@ -219,6 +224,14 @@ module HTTPX
       @parser.close if @parser
     end
 
+    # bypasses the state machine to force closing of connections still connecting.
+    # **only** used for Happy Eyeballs v2.
+    def force_reset
+      @state = :closing
+      transition(:closed)
+      emit(:close)
+    end
+
     def reset
       transition(:closing)
       transition(:closed)
@@ -309,7 +322,7 @@ module HTTPX
           # * the number of inflight requests
           # * the number of pending requests
           # * whether the write buffer has bytes (i.e. for close handshake)
-          if @pending.size.zero? && @inflight.zero? && @write_buffer.empty?
+          if @pending.empty? && @inflight.zero? && @write_buffer.empty?
             log(level: 3) { "NO MORE REQUESTS..." }
             return
           end
@@ -353,7 +366,7 @@ module HTTPX
             break if @state == :closing || @state == :closed
 
             # exit #consume altogether if all outstanding requests have been dealt with
-            return if @pending.size.zero? && @inflight.zero?
+            return if @pending.empty? && @inflight.zero?
           end unless ((ints = interests).nil? || ints == :w || @state == :closing) && !epiped
 
           #
@@ -512,10 +525,23 @@ module HTTPX
 
     def transition(nextstate)
       handle_transition(nextstate)
-    rescue Errno::ECONNREFUSED,
+    rescue Errno::ECONNABORTED,
+           Errno::ECONNREFUSED,
+           Errno::ECONNRESET,
            Errno::EADDRNOTAVAIL,
            Errno::EHOSTUNREACH,
-           TLSError => e
+           Errno::EINVAL,
+           Errno::ENETUNREACH,
+           Errno::EPIPE,
+           Errno::ENOENT,
+           SocketError => e
+      # connect errors, exit gracefully
+      error = ConnectionError.new(e.message)
+      error.set_backtrace(e.backtrace)
+      connecting? && callbacks(:connect_error).any? ? emit(:connect_error, error) : handle_error(error)
+      @state = :closed
+      emit(:close)
+    rescue TLSError => e
       # connect errors, exit gracefully
       handle_error(e)
       @state = :closed
@@ -531,6 +557,8 @@ module HTTPX
         return if @state == :closed
 
         @io.connect
+        emit(:tcp_open, self) if @io.state == :connected
+
         return unless @io.connected?
 
         @connected_at = Utils.now

data/lib/httpx/errors.rb

@@ -5,6 +5,8 @@ module HTTPX
 
   class UnsupportedSchemeError < Error; end
 
+  class ConnectionError < Error; end
+
   class TimeoutError < Error
     attr_reader :timeout
 

data/lib/httpx/extensions.rb

@@ -55,6 +55,7 @@ module HTTPX
   end
 
   module NumericExtensions
+    # Ruby 2.4 backport
     refine Numeric do
       def infinite?
         self == Float::INFINITY
@@ -64,6 +65,7 @@ module HTTPX
 
   module StringExtensions
     refine String do
+      # Ruby 2.5 backport
       def delete_suffix!(suffix)
         suffix = Backports.coerce_to_str(suffix)
         chomp! if frozen?
@@ -80,6 +82,7 @@ module HTTPX
 
   module HashExtensions
     refine Hash do
+      # Ruby 2.4 backport
       def compact
         h = {}
         each do |key, value|
@@ -93,7 +96,7 @@ module HTTPX
   module ArrayExtensions
     module FilterMap
       refine Array do
-
+        # Ruby 2.7 backport
         def filter_map
           return to_enum(:filter_map) unless block_given?
 
@@ -107,6 +110,7 @@ module HTTPX
 
     module Sum
       refine Array do
+        # Ruby 2.6 backport
         def sum(accumulator = 0, &block)
           values = block_given? ? map(&block) : self
           values.inject(accumulator, :+)
@@ -116,6 +120,7 @@ module HTTPX
 
     module Intersect
       refine Array do
+        # Ruby 3.1 backport
         def intersect?(arr)
           if size < arr.size
             smaller = self
@@ -130,6 +135,7 @@ module HTTPX
 
   module IOExtensions
     refine IO do
+      # Ruby 2.3 backport
       # provides a fallback for rubies where IO#wait isn't implemented,
       # but IO#wait_readable and IO#wait_writable are.
       def wait(timeout = nil, _mode = :read_write)
@@ -144,6 +150,7 @@ module HTTPX
 
   module RegexpExtensions
     refine(Regexp) do
+      # Ruby 2.4 backport
       def match?(*args)
         !match(*args).nil?
       end
@@ -151,7 +158,9 @@ module HTTPX
   end
 
   module URIExtensions
+    # uri 0.11 backport, ships with ruby 3.1
     refine URI::Generic do
+
       def non_ascii_hostname
         @non_ascii_hostname
       end

data/lib/httpx/io/tcp.rb

@@ -74,7 +74,8 @@ module HTTPX
       try_connect
     rescue Errno::ECONNREFUSED,
            Errno::EADDRNOTAVAIL,
-           Errno::EHOSTUNREACH => e
+           Errno::EHOSTUNREACH,
+           SocketError => e
       raise e if @ip_index <= 0
 
       log { "failed connecting to #{@ip} (#{e.message}), trying next..." }

data/lib/httpx/io/udp.rb

@@ -6,11 +6,10 @@ module HTTPX
   class UDP
     include Loggable
 
-    def initialize(uri, _, options)
-      ip = IPAddr.new(uri.host)
-      @host = ip.to_s
-      @port = uri.port
-      @io = UDPSocket.new(ip.family)
+    def initialize(ip, port, options)
+      @host = ip
+      @port = port
+      @io = UDPSocket.new(IPAddr.new(ip).family)
       @options = options
     end
 

data/lib/httpx/options.rb

@@ -15,7 +15,7 @@ module HTTPX
     # https://github.com/ruby/resolv/blob/095f1c003f6073730500f02acbdbc55f83d70987/lib/resolv.rb#L408
     ip_address_families = begin
       list = Socket.ip_address_list
-      if list.any? { |a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? }
+      if list.any? { |a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? && !a.ipv6_unique_local? }
         [Socket::AF_INET6, Socket::AF_INET]
       else
         [Socket::AF_INET]
@@ -100,7 +100,7 @@ module HTTPX
       end
 
       def def_option(optname, *args, &block)
-        if args.size.zero? && !block
+        if args.empty? && !block
           class_eval(<<-OUT, __FILE__, __LINE__ + 1)
             def option_#{optname}(v); v; end # def option_smth(v); v; end
           OUT

data/lib/httpx/plugins/authentication.rb

@@ -6,7 +6,7 @@ module HTTPX
     # This plugin adds a shim +authentication+ method to the session, which will fill
     # the HTTP Authorization header.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#authentication
+    # https://gitlab.com/os85/httpx/wikis/Authentication#authentication
     #
     module Authentication
       module InstanceMethods

data/lib/httpx/plugins/aws_sigv4.rb

@@ -7,7 +7,7 @@ module HTTPX
     #
     # https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/AWS-SigV4
+    # https://gitlab.com/os85/httpx/wikis/AWS-SigV4
     #
     module AWSSigV4
       Credentials = Struct.new(:username, :password, :security_token)
@@ -115,7 +115,7 @@ module HTTPX
           elsif value.respond_to?(:each)
             digest = OpenSSL::Digest.new(@algorithm)
 
-            mb_buffer = value.each.each_with_object("".b) do |chunk, buffer|
+            mb_buffer = value.each.with_object("".b) do |chunk, buffer|
               buffer << chunk
               break if buffer.bytesize >= 1024 * 1024
             end

data/lib/httpx/plugins/basic_authentication.rb

@@ -5,7 +5,7 @@ module HTTPX
     #
     # This plugin adds helper methods to implement HTTP Basic Auth (https://tools.ietf.org/html/rfc7617)
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#basic-authentication
+    # https://gitlab.com/os85/httpx/wikis/Authentication#basic-authentication
     #
     module BasicAuth
       class << self

data/lib/httpx/plugins/circuit_breaker/circuit.rb

@@ -28,7 +28,7 @@ module HTTPX
           nil
         when :half_open
           # return nothing or smth based on ratio
-          return if Random::DEFAULT.rand >= @circuit_breaker_half_open_drip_rate
+          return if Random.rand >= @circuit_breaker_half_open_drip_rate
 
           @response
         when :open

data/lib/httpx/plugins/circuit_breaker.rb

@@ -5,7 +5,7 @@ module HTTPX
     #
     # This plugin implements a circuit breaker around connection errors.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Circuit-Breaker
+    # https://gitlab.com/os85/httpx/wikis/Circuit-Breaker
     #
     module CircuitBreaker
       using URIExtensions

data/lib/httpx/plugins/compression/gzip.rb

@@ -56,7 +56,7 @@ module HTTPX
 
         class Inflater
           def initialize(bytesize)
-            @inflater = Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
+            @inflater = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
             @bytesize = bytesize
             @buffer = nil
           end

data/lib/httpx/plugins/compression.rb

@@ -10,7 +10,7 @@ module HTTPX
     #
     # It supports both *gzip* and *deflate*.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Compression
+    # https://gitlab.com/os85/httpx/wikis/Compression
     #
     module Compression
       class << self
@@ -30,7 +30,7 @@ module HTTPX
       module OptionsMethods
         def option_compression_threshold_size(value)
           bytes = Integer(value)
-          raise TypeError, ":expect_threshold_size must be positive" unless bytes.positive?
+          raise TypeError, ":compression_threshold_size must be positive" unless bytes.positive?
 
           bytes
         end
@@ -138,7 +138,7 @@ module HTTPX
         def each(&blk)
           return enum_for(__method__) unless blk
 
-          return deflate(&blk) if @buffer.size.zero?
+          return deflate(&blk) if @buffer.size.zero? # rubocop:disable Style/ZeroLengthPredicate
 
           @buffer.rewind
           @buffer.each(&blk)
@@ -152,7 +152,7 @@ module HTTPX
         private
 
         def deflate(&blk)
-          return unless @buffer.size.zero?
+          return unless @buffer.size.zero? # rubocop:disable Style/ZeroLengthPredicate
 
           @body.rewind
           @deflater.deflate(@body, @buffer, chunk_size: 16_384, &blk)

data/lib/httpx/plugins/cookies.rb

@@ -9,7 +9,7 @@ module HTTPX
     #
     # It also adds a *#cookies* helper, so that you can pre-fill the cookies of a session.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Cookies
+    # https://gitlab.com/os85/httpx/wikis/Cookies
     #
     module Cookies
       def self.load_dependencies(*)

data/lib/httpx/plugins/digest_authentication.rb

@@ -5,7 +5,7 @@ module HTTPX
     #
     # This plugin adds helper methods to implement HTTP Digest Auth (https://tools.ietf.org/html/rfc7616)
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#authentication
+    # https://gitlab.com/os85/httpx/wikis/Authentication#authentication
     #
     module DigestAuth
       DigestError = Class.new(Error)
@@ -46,6 +46,8 @@ module HTTPX
 
             probe_response = wrap { super(request).first }
 
+            return probe_response unless probe_response.is_a?(Response)
+
             if probe_response.status == 401 && digest.can_authenticate?(probe_response.headers["www-authenticate"])
               request.transition(:idle)
               request.headers["authorization"] = digest.authenticate(request, probe_response.headers["www-authenticate"])

data/lib/httpx/plugins/expect.rb

@@ -5,7 +5,7 @@ module HTTPX
     #
     # This plugin makes all HTTP/1.1 requests with a body send the "Expect: 100-continue".
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Expect#expect
+    # https://gitlab.com/os85/httpx/wikis/Expect#expect
     #
     module Expect
       EXPECT_TIMEOUT = 2
@@ -50,7 +50,8 @@ module HTTPX
         end
 
         def response=(response)
-          if response && response.status == 100 &&
+          if response.is_a?(Response) &&
+             response.status == 100 &&
              !@headers.key?("expect") &&
              (@state == :body || @state == :done)
 
@@ -92,7 +93,7 @@ module HTTPX
           response = @responses.delete(request)
           return unless response
 
-          if response.status == 417 && request.headers.key?("expect")
+          if response.is_a?(Response) && response.status == 417 && request.headers.key?("expect")
             response.close
             request.headers.delete("expect")
             request.transition(:idle)

data/lib/httpx/plugins/follow_redirects.rb

@@ -11,7 +11,7 @@ module HTTPX
     #
     # It also doesn't follow insecure redirects (https -> http) by default (see *follow_insecure_redirects*).
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Follow-Redirects
+    # https://gitlab.com/os85/httpx/wikis/Follow-Redirects
     #
     module FollowRedirects
       MAX_REDIRECTS = 3
@@ -44,6 +44,7 @@ module HTTPX
 
           max_redirects = redirect_request.max_redirects
 
+          return response unless response.is_a?(Response)
           return response unless REDIRECT_STATUS.include?(response.status) && response.headers.key?("location")
           return response unless max_redirects.positive?
 
@@ -121,6 +122,12 @@ module HTTPX
           @redirect_request || self
         end
 
+        def response
+          return super unless @redirect_request
+
+          @redirect_request.response
+        end
+
         def max_redirects
           @options.max_redirects || MAX_REDIRECTS
         end

data/lib/httpx/plugins/grpc/message.rb

@@ -57,7 +57,7 @@ module HTTPX
 
             yield data
 
-            message = message.byteslice((5 + size)..-1)
+            message = message.byteslice((size + 5)..-1)
           end
         end
 

data/lib/httpx/plugins/grpc.rb

@@ -16,7 +16,7 @@ module HTTPX
     #
     # This plugin adds DSL to build GRPC interfaces.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/GRPC
+    # https://gitlab.com/os85/httpx/wikis/GRPC
     #
     module GRPC
       unless String.method_defined?(:underscore)

data/lib/httpx/plugins/h2c.rb

@@ -6,7 +6,7 @@ module HTTPX
     # This plugin adds support for upgrading a plaintext HTTP/1.1 connection to HTTP/2
     # (https://tools.ietf.org/html/rfc7540#section-3.2)
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Upgrade#h2c
+    # https://gitlab.com/os85/httpx/wikis/Upgrade#h2c
     #
     module H2C
       VALID_H2C_VERBS = %i[get options head].freeze

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

@@ -5,10 +5,6 @@ require "delegate"
 
 module HTTPX::Plugins
   module Multipart
-    using HTTPX::RegexpExtensions unless Regexp.method_defined?(:match?)
-
-    CRLF = "\r\n"
-
     class FilePart < SimpleDelegator
       attr_reader :original_filename, :content_type
 
@@ -20,32 +16,14 @@ module HTTPX::Plugins
       end
     end
 
-    TOKEN = %r{[^\s()<>,;:\\"/\[\]?=]+}.freeze
-    VALUE = /"(?:\\"|[^"])*"|#{TOKEN}/.freeze
-    CONDISP = /Content-Disposition:\s*#{TOKEN}\s*/i.freeze
-    BROKEN_QUOTED = /^#{CONDISP}.*;\s*filename="(.*?)"(?:\s*$|\s*;\s*#{TOKEN}=)/i.freeze
-    BROKEN_UNQUOTED = /^#{CONDISP}.*;\s*filename=(#{TOKEN})/i.freeze
-    MULTIPART_CONTENT_TYPE = /Content-Type: (.*)#{CRLF}/ni.freeze
-    MULTIPART_CONTENT_DISPOSITION = /Content-Disposition:.*;\s*name=(#{VALUE})/ni.freeze
-    MULTIPART_CONTENT_ID = /Content-ID:\s*([^#{CRLF}]*)/ni.freeze
-    # Updated definitions from RFC 2231
-    ATTRIBUTE_CHAR = %r{[^ \t\v\n\r)(><@,;:\\"/\[\]?='*%]}.freeze
-    ATTRIBUTE = /#{ATTRIBUTE_CHAR}+/.freeze
-    SECTION = /\*[0-9]+/.freeze
-    REGULAR_PARAMETER_NAME = /#{ATTRIBUTE}#{SECTION}?/.freeze
-    REGULAR_PARAMETER = /(#{REGULAR_PARAMETER_NAME})=(#{VALUE})/.freeze
-    EXTENDED_OTHER_NAME = /#{ATTRIBUTE}\*[1-9][0-9]*\*/.freeze
-    EXTENDED_OTHER_VALUE = /%[0-9a-fA-F]{2}|#{ATTRIBUTE_CHAR}/.freeze
-    EXTENDED_OTHER_PARAMETER = /(#{EXTENDED_OTHER_NAME})=(#{EXTENDED_OTHER_VALUE}*)/.freeze
-    EXTENDED_INITIAL_NAME = /#{ATTRIBUTE}(?:\*0)?\*/.freeze
-    EXTENDED_INITIAL_VALUE = /[a-zA-Z0-9\-]*'[a-zA-Z0-9\-]*'#{EXTENDED_OTHER_VALUE}*/.freeze
-    EXTENDED_INITIAL_PARAMETER = /(#{EXTENDED_INITIAL_NAME})=(#{EXTENDED_INITIAL_VALUE})/.freeze
-    EXTENDED_PARAMETER = /#{EXTENDED_INITIAL_PARAMETER}|#{EXTENDED_OTHER_PARAMETER}/.freeze
-    DISPPARM = /;\s*(?:#{REGULAR_PARAMETER}|#{EXTENDED_PARAMETER})\s*/.freeze
-    RFC2183 = /^#{CONDISP}(#{DISPPARM})+$/i.freeze
-
     class Decoder
+      include HTTPX::Utils
+
+      CRLF = "\r\n"
       BOUNDARY_RE = /;\s*boundary=([^;]+)/i.freeze
+      MULTIPART_CONTENT_TYPE = /Content-Type: (.*)#{CRLF}/ni.freeze
+      MULTIPART_CONTENT_DISPOSITION = /Content-Disposition:.*;\s*name=(#{VALUE})/ni.freeze
+      MULTIPART_CONTENT_ID = /Content-ID:\s*([^#{CRLF}]*)/ni.freeze
       WINDOW_SIZE = 2 << 14
 
       def initialize(response)
@@ -102,7 +80,7 @@ module HTTPX::Plugins
             name = head[MULTIPART_CONTENT_ID, 1]
           end
 
-          filename = get_filename(head)
+          filename = HTTPX::Utils.get_filename(head)
 
           name = filename || +"#{content_type || "text/plain"}[]" if name.nil? || name.empty?
 
@@ -154,34 +132,6 @@ module HTTPX::Plugins
           raise Error, "parsing should have been over by now"
         end until @buffer.empty?
       end
-
-      def get_filename(head)
-        filename = nil
-        case head
-        when RFC2183
-          params = Hash[*head.scan(DISPPARM).flat_map(&:compact)]
-
-          if (filename = params["filename"])
-            filename = Regexp.last_match(1) if filename =~ /^"(.*)"$/
-          elsif (filename = params["filename*"])
-            encoding, _, filename = filename.split("'", 3)
-          end
-        when BROKEN_QUOTED, BROKEN_UNQUOTED
-          filename = Regexp.last_match(1)
-        end
-
-        return unless filename
-
-        filename = URI::DEFAULT_PARSER.unescape(filename) if filename.scan(/%.?.?/).all? { |s| /%[0-9a-fA-F]{2}/.match?(s) }
-
-        filename.scrub!
-
-        filename = filename.gsub(/\\(.)/, '\1') unless /\\[^\\"]/.match?(filename)
-
-        filename.force_encoding ::Encoding.find(encoding) if encoding
-
-        filename
-      end
     end
   end
 end

data/lib/httpx/plugins/multipart.rb

@@ -7,7 +7,7 @@ module HTTPX
     #
     #   HTTPX.post(URL, form: form: { image: HTTP::FormData::File.new("path/to/file")})
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Multipart-Uploads
+    # https://gitlab.com/os85/httpx/wikis/Multipart-Uploads
     #
     module Multipart
       MULTIPART_VALUE_COND = lambda do |value|
@@ -29,7 +29,7 @@ module HTTPX
               # in order not to break legacy code, we'll keep loading http/form_data for them.
               require "http/form_data"
               warn "httpx: http/form_data is no longer a requirement to use HTTPX :multipart plugin. See migration instructions under" \
-                   "https://honeyryderchuck.gitlab.io/httpx/wiki/Multipart-Uploads.html#notes. \n\n" \
+                   "https://os85.gitlab.io/httpx/wiki/Multipart-Uploads.html#notes. \n\n" \
                    "If you'd like to stop seeing this message, require 'http/form_data' yourself."
             end
           rescue LoadError

data/lib/httpx/plugins/ntlm_authentication.rb

@@ -3,7 +3,7 @@
 module HTTPX
   module Plugins
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Authentication#ntlm-authentication
+    # https://gitlab.com/os85/httpx/wikis/Authentication#ntlm-authentication
     #
     module NTLMAuth
       class << self
@@ -39,6 +39,8 @@ module HTTPX
               request.headers["authorization"] = ntlm.negotiate
               probe_response = wrap { super(request).first }
 
+              return probe_response unless probe_response.is_a?(Response)
+
               if probe_response.status == 401 && ntlm.can_authenticate?(probe_response.headers["www-authenticate"])
                 request.transition(:idle)
                 request.headers["authorization"] = ntlm.authenticate(request, probe_response.headers["www-authenticate"])

data/lib/httpx/plugins/persistent.rb

@@ -15,7 +15,7 @@ module HTTPX
     # This plugin is also not recommendable when connecting to >9000 (like, a lot) different origins.
     # So when you use this, make sure that you don't fall into this trap.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Persistent
+    # https://gitlab.com/os85/httpx/wikis/Persistent
     #
     module Persistent
       def self.load_dependencies(klass)

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

@@ -23,6 +23,7 @@ module HTTPX
             response = super
 
             if response &&
+               response.is_a?(Response) &&
                response.status == 407 &&
                !request.headers.key?("proxy-authorization") &&
                response.headers.key?("proxy-authenticate")
@@ -113,13 +114,14 @@ module HTTPX
 
           def __http_on_connect(request, response)
             @inflight -= 1
-            if response.status == 200
+            if response.is_a?(Response) && response.status == 200
               req = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options)
               transition(:connected)
               throw(:called)
-            elsif response.status == 407 &&
+            elsif response.is_a?(Response) &&
+                  response.status == 407 &&
                   !request.headers.key?("proxy-authorization") &&
                   @options.proxy.can_authenticate?(response.headers["proxy-authenticate"])
 

data/lib/httpx/plugins/proxy.rb

@@ -12,7 +12,7 @@ module HTTPX
     # * Socks4/4a proxies
     # * Socks5 proxies
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Proxy
+    # https://gitlab.com/os85/httpx/wikis/Proxy
     #
     module Proxy
       Error = HTTPProxyError

data/lib/httpx/plugins/push_promise.rb

@@ -8,7 +8,7 @@ module HTTPX
     # In order to benefit from this, requests are sent one at a time, so that
     # no push responses are received after corresponding request has been sent.
     #
-    # https://gitlab.com/honeyryderchuck/httpx/wikis/Server-Push
+    # https://gitlab.com/os85/httpx/wikis/Server-Push
     #
     module PushPromise
       def self.extra_options(options)