Commit dc080710 authored by HoneyryderChuck's avatar HoneyryderChuck
Browse files

Merge branch 'proxy-reconnect' into 'master' 

fix: ensure that the parser used for the CONNECT tunnel handshake is wiped on connection close

See merge request !467
parents f239b035 93a83b99

lib/httpx/callbacks.rb

+2 −2
Changes for lib/httpx/callbacks.rb: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ module HTTPX 
      end

    end



    def emit(type, *args)

    def emit(type, ...)

      log { "emit #{type.inspect} callbacks" } if respond_to?(:log)

      callbacks(type).delete_if { |pr| :delete == pr.call(*args) } # rubocop:disable Style/YodaCondition

      callbacks(type).delete_if { |pr| :delete == pr.call(...) } # rubocop:disable Style/YodaCondition

    end



    def callbacks_for?(type)

lib/httpx/chainable.rb

+2 −2
Changes for lib/httpx/chainable.rb: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ module HTTPX 
    end



    # delegates to the default session (see HTTPX::Session#request).

    def request(*args, **options)

      branch(default_options).request(*args, **options)

    def request(...)

      branch(default_options).request(...)

    end



    def accept(type)

lib/httpx/plugins/cookies.rb

+2 −2
Changes for lib/httpx/plugins/cookies.rb: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ module HTTPX 


        # factory method to return a Jar to the user, which can then manipulate

        # externally to the session.

        def make_jar(*args)

          Jar.new(*args)

        def make_jar(...)

          Jar.new(...)

        end



        private

lib/httpx/plugins/cookies/cookie.rb

+1 −1
Changes for lib/httpx/plugins/cookies/cookie.rb: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ module HTTPX 
      end



      class << self

        def new(cookie, *args)

        def new(cookie, *)

          case cookie

          when self

            cookie

lib/httpx/plugins/grpc/call.rb

+4 −4
Changes for lib/httpx/plugins/grpc/call.rb: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -48,12 +48,12 @@ module HTTPX 
          end

        end



        def respond_to_missing?(meth, *args, &blk)

          grpc_response.respond_to?(meth, *args) || super

        def respond_to_missing?(meth, ...)

          grpc_response.respond_to?(meth, ...) || super

        end



        def method_missing(meth, *args, &blk)

          return grpc_response.__send__(meth, *args, &blk) if grpc_response.respond_to?(meth)

        def method_missing(meth, ...)

          return grpc_response.__send__(meth, ...) if grpc_response.respond_to?(meth)



          super

        end