httpx 0.24.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e8fd5ae58c24b0e8d71267133209622fad2e16e2196403937f3d330330fc72
-  data.tar.gz: 2684eb339c078326609390667a8c9522225fdf56ff2fdece7571022c110d96fc
+  metadata.gz: 40c3560dd37c1fc898a5e0beb5a73148285cdae564ee285552aaf4ccb42bc06a
+  data.tar.gz: 0463ddfdb74f304264c28c513cac13c05d0b0bfc6089a7466d251c8cd94e8782
 SHA512:
-  metadata.gz: fc776c73232482381b6c8861cd6b743b16e2ccd03a8aa2764ccb30668c6e13ca3a560b51d66f0569cbf1f0d71c2ad101ad04e3b1c187336496b6424633b12e41
-  data.tar.gz: aaa3cbf6a87825896331a2cd0aa2604e82738510507cade210092fcbb060456765750ed3e13af1395fc1cc998abf0c6222eda776f27d152e9e46c406ed3cce4d
+  metadata.gz: 7a041d6c249f44a8f3c8c0fe4d776722b08e704ef76ba1b6e6a9791a0f7f1dbd191f7c2aa6f8f621ef2a4cb70af51c8ed7ec81653b28e9fd669f8da3687c0423
+  data.tar.gz: 8071a59d3a00d64981625cdb7e37dbd5749d3baaa597bb78bf8d777559cd6faadd012c6fbad1482a93dfafe5da47650f3059b72665823e197529655ab73c30eb

data/LICENSE.txt

@@ -189,51 +189,3 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
-* lib/httpx/domain_name.rb
-
-This file is derived from the implementation of punycode available at
-here:
-
-https://www.verisign.com/en_US/channel-resources/domain-registry-products/idn-sdks/index.xhtml
-
-Copyright (C) 2000-2002 Verisign Inc., All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
- 1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- 2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
- 3) Neither the name of the VeriSign Inc. nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-This software is licensed under the BSD open source license. For more
-information visit www.opensource.org.
-
-Authors:
- John Colosi (VeriSign)
- Srikanth Veeramachaneni (VeriSign)
- Nagesh Chigurupati (Verisign)
- Praveen Srinivasan(Verisign)

data/README.md

@@ -19,7 +19,7 @@ And also:
 
 * Compression (gzip, deflate, brotli)
 * Streaming Requests
-* Authentication (Basic Auth, Digest Auth, NTLM)
+* Auth (Basic Auth, Digest Auth, NTLM)
 * Expect 100-continue
 * Multipart Requests
 * Advanced Cookie handling
@@ -113,7 +113,7 @@ response = HTTPX.plugin(:basic_authentication)
                 .get("https://www.google.com")
 
 # more complex client objects can be cached, and are thread-safe
-http = HTTPX.plugin(:compression).plugin(:expect).with(headers: { "x-pvt-token" => "TOKEN"})
+http = HTTPX.plugin(:expect).with(headers: { "x-pvt-token" => "TOKEN"})
 http.get("https://example.com") # the above options will apply
 http.post("https://example2.com",  form: {name: "John", age: "22"}) # same, plus the form POST body
 ```
@@ -134,9 +134,9 @@ The test suite runs against [httpbin proxied over nghttp2](https://nghttp2.org/h
 
 ## Supported Rubies
 
-All Rubies greater or equal to 2.1, and always latest JRuby and Truffleruby.
+All Rubies greater or equal to 2.7, and always latest JRuby and Truffleruby.
 
-**Note**: This gem is tested against all latest patch versions, i.e. if you're using 2.2.0 and you experience some issue, please test it against 2.2.10 (latest patch version of 2.2) before creating an issue.
+**Note**: This gem is tested against all latest patch versions, i.e. if you're using 3.2.0 and you experience some issue, please test it against 3.2.$latest before creating an issue.
 
 ## Resources
 |               |                                                        |
@@ -149,15 +149,6 @@ All Rubies greater or equal to 2.1, and always latest JRuby and Truffleruby.
 
 ## Caveats
 
-### ALPN support
-
-ALPN negotiation is required for "auto" HTTP/2 "https" requests. This is available in ruby since version 2.3 .
-
-### Known bugs
-
-* Doesn't work with ruby 2.4.0 for Windows (see [#36](https://gitlab.com/os85/httpx/issues/36)).
-* Using `total_timeout` along with the `:persistent` plugin [does not work as you might expect](https://gitlab.com/os85/httpx/-/wikis/Timeouts#total_timeout).
-
 ## Versioning Policy
 
 Although 0.x software, `httpx` is considered API-stable and production-ready, i.e. current API or options may be subject to deprecation and emit log warnings, but can only effectively be removed in a major version change.

data/doc/release_notes/0_24_4.md

@@ -8,11 +8,11 @@
   * whenever possible, `httpx` sessions will recycle used connections so that, in the case of TLS connections, the first session will keep being reusedd, thereby diminishing the overhead of subsequent TLS handshakes on the same host.
   * TLS sessions are only reused in the scope of the same `httpx` session, unless the `:persistent` plugin is used, in which case, the persisted `httpx` session will always try to resume TLS sessions.
 
-## Bugfixess
+## Bugfixes
 
 * When explicitly using IP addresses in the URL host, TLS handshake will now verify tif he IP address is included in the certificate.
   * IP address will keep not be used for SNI, as per RFC 6066, section 3.
   * ex: `http.get("https://10.12.0.12/get")`
-  * if you want the prior behavior, set `HTTPX.with(ssl: {verify_hostname: faalse})`
+  * if you want the prior behavior, set `HTTPX.with(ssl: {verify_hostname: false})`
 * Turn TLS hostname verification on for `jruby` (it's turned off by default).
-  * if you want the prior behavior, set `HTTPX.with(ssl: {verify_hostname: faalse})`
+  * if you want the prior behavior, set `HTTPX.with(ssl: {verify_hostname: false})`

data/doc/release_notes/1_0_0.md

@@ -0,0 +1,60 @@
+# 1.0.0
+
+## Breaking changes
+
+* the minimum supported ruby version is 2.7.0 .
+* The fallback support for IDNA 2003 has been removed. If you require this feature, install the [idnx gem](https://github.com/HoneyryderChuck/idnx), which `httpx` automatically integrates with when available (and supports IDNA 2008).
+* `:total_timeout` option has been removed (no session-wide timeout supported, use `:request_timeout`).
+* `:read_timeout` and `:write_timeout` are now set to 60 seconds by default, and preferred over `:operation_timeout`;
+  * the exception being in the `:stream` plugin, as the response is theoretically endless (so `:read_timeout` is unset).
+* The `:multipart` plugin is removed, as its functionality and API are now loaded by default (no API changes).
+* The `:compression` plugin is removed, as its functionality and API are now loaded by default (no API changes).
+  * `:compression_threshold_size` was removed (formats in `"content-encoding"` request header will always encode the request body).
+  * the new `:compress_request_body` and `:decompress_response_body` can be set to `false` to (respectively) disable compression of passed input body, or decompression of the response body.
+* `:retries` plugin: the `:retry_on` condition will **not** replace default retriable error checks, it will now instead be triggered **only if** no retryable error has been found.
+
+### plugins
+
+* `:authentication` plugin becomes `:auth`.
+  * `.authentication` helper becomes `.authorization`.
+* `:basic_authentication` plugin becomes `:basic_auth`.
+  * `:basic_authentication` helper is removed.
+* `:digest_authentication` plugin becomes `:digest_auth`.
+  * `:digest_authentication` helper is removed.
+* `:ntlm_authentication` plugin becomes `:ntlm_auth`.
+  * `:ntlm_authentication` helper is removed.
+* OAuth plugin: `:oauth_authentication` helper is rename to `:oauth_auth`.
+* `:compression/brotli` plugin becomes `:brotli`.
+
+### Support removed for deprecated APIs
+
+* The deprecated `HTTPX::Client` constant lookup has been removed (use `HTTPX::Session` instead).
+* The deprecated `HTTPX.timeout({...})` function has been removed (use `HTTPX.with(timeout: {...})` instead).
+* The deprecated `HTTPX.headers({...})` function has been removed (use `HTTPX.with(headers: {...})` instead).
+* The deprecated `HTTPX.plugins(...)` function has been removed (use `HTTPX.plugin(...).plugin(...)...` instead).
+* The deprecated `:transport_options` option, which was only valid for UNIX connections, has been removed (use `:addresses` instead).
+* The deprecated `def_option(...)` function, previously used to define additional options in plugins, has been removed (use `def option_$new_option)` instead).
+* The deprecated `:loop_timeout` timeout option has been removed.
+* `:stream` plugin: the deprecated `HTTPX::InstanceMethods::StreamResponse` has been removed (use `HTTPX::StreamResponse` instead).
+* The deprecated usage of symbols to indicate HTTP verbs (i.e. `HTTPX.request(:get, ...)` or `HTTPX.build_request(:get, ...)`) is not supported anymore (use the upcase string always, i.e. `HTTPX.request("GET", ...)` or `HTTPX.build_request("GET", ...)`, instead).
+* The deprecated `HTTPX::ErrorResponse#status` method has been removed (use `HTTPX::ErrorResponse#error` instead).
+
+### dependencies
+
+* `http-2-next` minimum supported version is 1.0.0.
+* `:datadog` adapter only supports `ddtrace` gem 1.x or higher.
+* `:faraday` adapter only supports `faraday` gem 1.x or higher.
+
+## Improvements
+
+* `circuit_breaker`: the drip rate of real request during the "half-open" stage of a circuit will reliably distribute real requests (as per the drip rate) over the `max_attempts`, before the circuit is closed.
+
+## Bugfixes
+
+* Tempfiles are now correctly identified as file inputs for multipart requests.
+* fixed `proxy` plugin behaviour when loaded with the `follow_redirects` plugin and processing a 305 response (request needs to be retried on a different proxy).
+
+## Chore
+
+* `:grpc` plugin: connection won't buffer requests before HTTP/2 handshake is commpleted, i.e. works the same as plain `httpx` HTTP/2 connection establishment.
+  * if you are relying on this, you can keep the old behavior this way: `HTTPX.plugin(:grpc, http2_settings: { wait_for_handshake: false })`.

data/lib/httpx/adapters/datadog.rb

@@ -1,51 +1,24 @@
 # frozen_string_literal: true
 
-if defined?(DDTrace) && DDTrace::VERSION::STRING >= "1.0.0"
-  require "datadog/tracing/contrib/integration"
-  require "datadog/tracing/contrib/configuration/settings"
-  require "datadog/tracing/contrib/patcher"
+require "datadog/tracing/contrib/integration"
+require "datadog/tracing/contrib/configuration/settings"
+require "datadog/tracing/contrib/patcher"
 
-  TRACING_MODULE = Datadog::Tracing
-else
-
-  require "ddtrace/contrib/integration"
-  require "ddtrace/contrib/configuration/settings"
-  require "ddtrace/contrib/patcher"
-
-  TRACING_MODULE = Datadog
-end
-
-module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
+module Datadog::Tracing
   module Contrib
     module HTTPX
-      if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
-        METADATA_MODULE = TRACING_MODULE::Metadata
-
-        TYPE_OUTBOUND = TRACING_MODULE::Metadata::Ext::HTTP::TYPE_OUTBOUND
-
-        TAG_PEER_SERVICE = TRACING_MODULE::Metadata::Ext::TAG_PEER_SERVICE
+      METADATA_MODULE = Datadog::Tracing::Metadata
 
-        TAG_URL = TRACING_MODULE::Metadata::Ext::HTTP::TAG_URL
-        TAG_METHOD = TRACING_MODULE::Metadata::Ext::HTTP::TAG_METHOD
-        TAG_TARGET_HOST = TRACING_MODULE::Metadata::Ext::NET::TAG_TARGET_HOST
-        TAG_TARGET_PORT = TRACING_MODULE::Metadata::Ext::NET::TAG_TARGET_PORT
+      TYPE_OUTBOUND = Datadog::Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
-        TAG_STATUS_CODE = TRACING_MODULE::Metadata::Ext::HTTP::TAG_STATUS_CODE
+      TAG_PEER_SERVICE = Datadog::Tracing::Metadata::Ext::TAG_PEER_SERVICE
 
-      else
+      TAG_URL = Datadog::Tracing::Metadata::Ext::HTTP::TAG_URL
+      TAG_METHOD = Datadog::Tracing::Metadata::Ext::HTTP::TAG_METHOD
+      TAG_TARGET_HOST = Datadog::Tracing::Metadata::Ext::NET::TAG_TARGET_HOST
+      TAG_TARGET_PORT = Datadog::Tracing::Metadata::Ext::NET::TAG_TARGET_PORT
 
-        METADATA_MODULE = Datadog
-
-        TYPE_OUTBOUND = TRACING_MODULE::Ext::HTTP::TYPE_OUTBOUND
-        TAG_PEER_SERVICE = TRACING_MODULE::Ext::Integration::TAG_PEER_SERVICE
-        TAG_URL = TRACING_MODULE::Ext::HTTP::URL
-        TAG_METHOD = TRACING_MODULE::Ext::HTTP::METHOD
-        TAG_TARGET_HOST = TRACING_MODULE::Ext::NET::TARGET_HOST
-        TAG_TARGET_PORT = TRACING_MODULE::Ext::NET::TARGET_PORT
-        TAG_STATUS_CODE = Datadog::Ext::HTTP::STATUS_CODE
-        PROPAGATOR = TRACING_MODULE::HTTPPropagator
-
-      end
+      TAG_STATUS_CODE = Datadog::Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE
 
       # HTTPX Datadog Plugin
       #
@@ -64,14 +37,18 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
           end
 
           def call
-            return unless tracing_enabled?
+            return unless Datadog::Tracing.enabled?
 
             @request.on(:response, &method(:finish))
 
             verb = @request.verb
             uri = @request.uri
 
-            @span = build_span
+            @span = Datadog::Tracing.trace(
+              SPAN_REQUEST,
+              service: service_name(@request.uri.host, configuration, Datadog.configuration_for(self)),
+              span_type: TYPE_OUTBOUND
+            )
 
             @span.resource = verb
 
@@ -86,7 +63,8 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
             # Tag as an external peer service
             @span.set_tag(TAG_PEER_SERVICE, @span.service)
 
-            propagate_headers if @configuration[:distributed_tracing]
+            Datadog::Tracing::Propagation::HTTP.inject!(Datadog::Tracing.active_trace,
+                                                        @request.headers) if @configuration[:distributed_tracing]
 
             # Set analytics sample rate
             if Contrib::Analytics.enabled?(@configuration[:analytics_enabled])
@@ -113,48 +91,8 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
 
           private
 
-          if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
-
-            def build_span
-              TRACING_MODULE.trace(
-                SPAN_REQUEST,
-                service: service_name(@request.uri.host, configuration, Datadog.configuration_for(self)),
-                span_type: TYPE_OUTBOUND
-              )
-            end
-
-            def propagate_headers
-              TRACING_MODULE::Propagation::HTTP.inject!(TRACING_MODULE.active_trace, @request.headers)
-            end
-
-            def configuration
-              @configuration ||= Datadog.configuration.tracing[:httpx, @request.uri.host]
-            end
-
-            def tracing_enabled?
-              TRACING_MODULE.enabled?
-            end
-          else
-            def build_span
-              service_name = configuration[:split_by_domain] ? @request.uri.host : configuration[:service_name]
-              configuration[:tracer].trace(
-                SPAN_REQUEST,
-                service: service_name,
-                span_type: TYPE_OUTBOUND
-              )
-            end
-
-            def propagate_headers
-              Datadog::HTTPPropagator.inject!(@span.context, @request.headers)
-            end
-
-            def configuration
-              @configuration ||= Datadog.configuration[:httpx, @request.uri.host]
-            end
-
-            def tracing_enabled?
-              configuration[:tracer].enabled
-            end
+          def configuration
+            @configuration ||= Datadog.configuration.tracing[:httpx, @request.uri.host]
           end
         end
 
@@ -179,7 +117,7 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
       module Configuration
         # Default settings for httpx
         #
-        class Settings < TRACING_MODULE::Contrib::Configuration::Settings
+        class Settings < Datadog::Tracing::Contrib::Configuration::Settings
           DEFAULT_ERROR_HANDLER = lambda do |response|
             Datadog::Ext::HTTP::ERROR_RANGE.cover?(response.status)
           end
@@ -188,45 +126,25 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
           option :distributed_tracing, default: true
           option :split_by_domain, default: false
 
-          if DDTrace::VERSION::STRING >= "1.13.0"
-            option :enabled do |o|
-              o.type :bool
-              o.env "DD_TRACE_HTTPX_ENABLED"
-              o.default true
-            end
-
-            option :analytics_enabled do |o|
-              o.type :bool
-              o.env "DD_TRACE_HTTPX_ANALYTICS_ENABLED"
-              o.default false
-            end
-
-            option :analytics_sample_rate do |o|
-              o.type :float
-              o.env "DD_TRACE_HTTPX_ANALYTICS_SAMPLE_RATE"
-              o.default 1.0
-            end
-          else
-            option :enabled do |o|
-              o.default { env_to_bool("DD_TRACE_HTTPX_ENABLED", true) }
-              o.lazy
-            end
+          option :enabled do |o|
+            o.default { env_to_bool("DD_TRACE_HTTPX_ENABLED", true) }
+            o.lazy
+          end
 
-            option :analytics_enabled do |o|
-              o.default { env_to_bool(%w[DD_TRACE_HTTPX_ANALYTICS_ENABLED DD_HTTPX_ANALYTICS_ENABLED], false) }
-              o.lazy
-            end
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(%w[DD_TRACE_HTTPX_ANALYTICS_ENABLED DD_HTTPX_ANALYTICS_ENABLED], false) }
+            o.lazy
+          end
 
-            option :analytics_sample_rate do |o|
-              o.default { env_to_float(%w[DD_TRACE_HTTPX_ANALYTICS_SAMPLE_RATE DD_HTTPX_ANALYTICS_SAMPLE_RATE], 1.0) }
-              o.lazy
-            end
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(%w[DD_TRACE_HTTPX_ANALYTICS_SAMPLE_RATE DD_HTTPX_ANALYTICS_SAMPLE_RATE], 1.0) }
+            o.lazy
           end
 
-          if defined?(TRACING_MODULE::Contrib::SpanAttributeSchema)
+          if defined?(Datadog::Tracing::Contrib::SpanAttributeSchema)
             option :service_name do |o|
               o.default do
-                TRACING_MODULE::Contrib::SpanAttributeSchema.fetch_service_name(
+                Datadog::Tracing::Contrib::SpanAttributeSchema.fetch_service_name(
                   "DD_TRACE_HTTPX_SERVICE_NAME",
                   "httpx"
                 )
@@ -244,26 +162,14 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
 
           option :distributed_tracing, default: true
 
-          if DDTrace::VERSION::STRING >= "1.15.0"
-            option :error_handler do |o|
-              o.type :proc
-              o.default_proc(&DEFAULT_ERROR_HANDLER)
-            end
-          elsif DDTrace::VERSION::STRING >= "1.13.0"
-            option :error_handler do |o|
-              o.type :proc
-              o.experimental_default_proc(&DEFAULT_ERROR_HANDLER)
-            end
-          else
-            option :error_handler, default: DEFAULT_ERROR_HANDLER
-          end
+          option :error_handler, default: DEFAULT_ERROR_HANDLER
         end
       end
 
       # Patcher enables patching of 'httpx' with datadog components.
       #
       module Patcher
-        include TRACING_MODULE::Contrib::Patcher
+        include Datadog::Tracing::Contrib::Patcher
 
         module_function
 
@@ -286,7 +192,6 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
       class Integration
         include Contrib::Integration
 
-        # MINIMUM_VERSION = Gem::Version.new('0.11.0')
         MINIMUM_VERSION = Gem::Version.new("0.10.2")
 
         register_as :httpx
@@ -303,14 +208,8 @@ module TRACING_MODULE # rubocop:disable Naming/ClassAndModuleCamelCase
           super && version >= MINIMUM_VERSION
         end
 
-        if defined?(::DDTrace) && ::DDTrace::VERSION::STRING >= "1.0.0"
-          def new_configuration
-            Configuration::Settings.new
-          end
-        else
-          def default_configuration
-            Configuration::Settings.new
-          end
+        def new_configuration
+          Configuration::Settings.new
         end
 
         def patcher

data/lib/httpx/adapters/faraday.rb

@@ -7,38 +7,11 @@ require "faraday"
 module Faraday
   class Adapter
     class HTTPX < Faraday::Adapter
-      # :nocov:
-      SSL_ERROR = if defined?(Faraday::SSLError)
-        Faraday::SSLError
-      else
-        Faraday::Error::SSLError
-      end
-
-      CONNECTION_FAILED_ERROR = if defined?(Faraday::ConnectionFailed)
-        Faraday::ConnectionFailed
-      else
-        Faraday::Error::ConnectionFailed
-      end
-      # :nocov:
-
-      unless Faraday::RequestOptions.method_defined?(:stream_response?)
-        module RequestOptionsExtensions
-          refine Faraday::RequestOptions do
-            def stream_response?
-              false
-            end
-          end
-        end
-        using RequestOptionsExtensions
-      end
-
       module RequestMixin
-        using ::HTTPX::HashExtensions
-
         def build_connection(env)
           return @connection if defined?(@connection)
 
-          @connection = ::HTTPX.plugin(:compression).plugin(:persistent).plugin(ReasonPlugin)
+          @connection = ::HTTPX.plugin(:persistent).plugin(ReasonPlugin)
           @connection = @connection.with(@connection_options) unless @connection_options.empty?
           connection_opts = options_from_env(env)
 
@@ -70,7 +43,7 @@ module Faraday
         def connect(env, &blk)
           connection(env, &blk)
         rescue ::HTTPX::TLSError => e
-          raise SSL_ERROR, e
+          raise Faraday::SSLError, e
         rescue Errno::ECONNABORTED,
                Errno::ECONNREFUSED,
                Errno::ECONNRESET,
@@ -79,9 +52,7 @@ module Faraday
                Errno::ENETUNREACH,
                Errno::EPIPE,
                ::HTTPX::ConnectionError => e
-          raise CONNECTION_FAILED_ERROR, e
-        rescue ::HTTPX::TimeoutError => e
-          raise Faraday::TimeoutError, e
+          raise Faraday::ConnectionFailed, e
         end
 
         def build_request(env)
@@ -159,24 +130,13 @@ module Faraday
       end
 
       module ReasonPlugin
-        if RUBY_VERSION < "2.5"
-          def self.load_dependencies(*)
-            require "webrick"
-          end
-        else
-          def self.load_dependencies(*)
-            require "net/http/status"
-          end
+        def self.load_dependencies(*)
+          require "net/http/status"
         end
+
         module ResponseMethods
-          if RUBY_VERSION < "2.5"
-            def reason
-              WEBrick::HTTPStatus::StatusMessage.fetch(@status)
-            end
-          else
-            def reason
-              Net::HTTP::STATUS_CODES.fetch(@status)
-            end
+          def reason
+            Net::HTTP::STATUS_CODES.fetch(@status)
           end
         end
       end
@@ -261,10 +221,7 @@ module Faraday
 
         # from Faraday::Adapter#request_timeout
         def request_timeout(type, options)
-          key = Faraday::Adapter::TIMEOUT_KEYS.fetch(type) do
-            msg = "Expected :read, :write, :open. Got #{type.inspect} :("
-            raise ArgumentError, msg
-          end
+          key = Faraday::Adapter::TIMEOUT_KEYS[type]
           options[key] || options[:timeout]
         end
       end

data/lib/httpx/adapters/webmock.rb

@@ -2,13 +2,8 @@
 
 module WebMock
   module HttpLibAdapters
-    if RUBY_VERSION < "2.5"
-      require "webrick/httpstatus"
-      HTTP_REASONS = WEBrick::HTTPStatus::StatusMessage
-    else
-      require "net/http/status"
-      HTTP_REASONS = Net::HTTP::STATUS_CODES
-    end
+    require "net/http/status"
+    HTTP_REASONS = Net::HTTP::STATUS_CODES
 
     #
     # HTTPX plugin for webmock.

data/lib/httpx/altsvc.rb

@@ -98,29 +98,11 @@ module HTTPX
       end
     end
 
-    # :nocov:
-    if RUBY_VERSION < "2.2"
-      def parse_altsvc_origin(alt_proto, alt_origin)
-        alt_scheme = parse_altsvc_scheme(alt_proto) or return
-
-        alt_origin = alt_origin[1..-2] if alt_origin.start_with?("\"") && alt_origin.end_with?("\"")
-        if alt_origin.start_with?(":")
-          alt_origin = "#{alt_scheme}://dummy#{alt_origin}"
-          uri = URI.parse(alt_origin)
-          uri.host = nil
-          uri
-        else
-          URI.parse("#{alt_scheme}://#{alt_origin}")
-        end
-      end
-    else
-      def parse_altsvc_origin(alt_proto, alt_origin)
-        alt_scheme = parse_altsvc_scheme(alt_proto) or return
-        alt_origin = alt_origin[1..-2] if alt_origin.start_with?("\"") && alt_origin.end_with?("\"")
+    def parse_altsvc_origin(alt_proto, alt_origin)
+      alt_scheme = parse_altsvc_scheme(alt_proto) or return
+      alt_origin = alt_origin[1..-2] if alt_origin.start_with?("\"") && alt_origin.end_with?("\"")
 
-        URI.parse("#{alt_scheme}://#{alt_origin}")
-      end
+      URI.parse("#{alt_scheme}://#{alt_origin}")
     end
-    # :nocov:
   end
 end

data/lib/httpx/base64.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+if RUBY_VERSION < "3.3.0"
+  require "base64"
+elsif !defined?(Base64)
+  module HTTPX
+    # require "base64" will not be a default gem after ruby 3.4.0
+    module Base64
+      module_function
+
+      def decode64(str)
+        str.unpack1("m")
+      end
+
+      def strict_encode64(bin)
+        [bin].pack("m0")
+      end
+
+      def urlsafe_encode64(bin, padding: true)
+        str = strict_encode64(bin)
+        str.chomp!("==") or str.chomp!("=") unless padding
+        str.tr!("+/", "-_")
+        str
+      end
+    end
+  end
+end

data/lib/httpx/chainable.rb

@@ -27,18 +27,6 @@ module HTTPX
       branch(default_options).request(*args, **options)
     end
 
-    # :nocov:
-    def timeout(**args)
-      warn ":#{__method__} is deprecated, use :with_timeout instead"
-      with(timeout: args)
-    end
-
-    def headers(headers)
-      warn ":#{__method__} is deprecated, use :with_headers instead"
-      with(headers: headers)
-    end
-    # :nocov:
-
     def accept(type)
       with(headers: { "accept" => String(type) })
     end
@@ -54,17 +42,6 @@ module HTTPX
       klass.plugin(pl, options, &blk).new
     end
 
-    # deprecated
-    # :nocov:
-    def plugins(pls)
-      warn ":#{__method__} is deprecated, use :plugin instead"
-      klass = is_a?(S) ? self.class : Session
-      klass = Class.new(klass)
-      klass.instance_variable_set(:@default_options, klass.default_options.merge(default_options))
-      klass.plugins(pls).new
-    end
-    # :nocov:
-
     def with(options, &blk)
       branch(default_options.merge(options), &blk)
     end