http 6.0.3-java → 6.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd78e2ee0f4e4f093e284702cdc18ae8da252d06ee4005deb0b3eb8c4add0124
-  data.tar.gz: 84f0c80f3f7eec22d22a10867037a4b07c321ffae8133d853cb49436fd1497a8
+  metadata.gz: d2fea08e3e5a60cfe0914e0ea94f64a064f711a9819b6f9d0780700794c1b922
+  data.tar.gz: '039011ec074fe464297bbd3e999e42e98b016c344bd02e06665302db1a13c53b'
 SHA512:
-  metadata.gz: 1313c852143dc40626397804cbc9a996ca4788ce38dbda0473d6c815ed3c3d537f6c65ee4b2ef6392aeeb351e8ba4606abf8905a2627398992d07b395f8051d5
-  data.tar.gz: 52fedc4dd9a6a2141d166eaec16a1e5b8e1247e7e3b8784e7809f45f5b25ea78eed07c75d70f05e5816cf66b659d3ce1ec6128a2180de45ff342393855fd60ae
+  metadata.gz: 9d235dc5f0933ac4305ad0bee1d629c41c44bdfe6cf2b1537e673293d1f7b7821906791745372b83f05a5c8dd6a7c62761dabcb5b2ce8da1633b6e884ad169b7
+  data.tar.gz: bec5ef03868ed94e26f733d47ecfa588966a0ecf4e346e8ceec2a7e348736cc02ef18f6fc89623a7a444b87d5d0190515e3484ffbcaa49d3cfcaeaf470723faa

data/lib/http/features/instrumentation.rb

@@ -14,8 +14,8 @@ module HTTP
     #
     # Emits two events on every request:
     #
-    #  * `start_request.http` before the request is made, so you can log the reqest being started
-    #  * `request.http` after the response is recieved, and contains `start`
+    #  * `start_request.http` before the request is made, so you can log the request being started
+    #  * `request.http` after the response is received, and contains `start`
     #    and `finish` so the duration of the request can be calculated.
     #
     class Instrumentation < Feature

data/lib/http/request/builder.rb

@@ -81,7 +81,7 @@ module HTTP
       # @return [HTTP::URI] the constructed URI
       # @api private
       def make_request_uri(uri)
-        uri = uri.to_s
+        uri = neutralize_protocol_relative(uri.to_s)
 
         if @options.base_uri? && uri !~ HTTP_OR_HTTPS_RE
           uri = resolve_against_base(uri)
@@ -101,6 +101,26 @@ module HTTP
         uri
       end
 
+      # Neutralize a leading "//" so it resolves as a relative path under base
+      #
+      # A "//"-prefixed input is a protocol-relative (network-path) reference
+      # per RFC 3986 §4.2 / §5.2. On the base_uri branch it would replace the
+      # base authority via URI#join; on the persistent branch naive
+      # concatenation produces "scheme://persistent//evil/path" which
+      # HTTP::URI.parse normalises into scheme://evil/path. Prepending "./"
+      # forces the input to resolve as an ordinary relative path under the
+      # configured base.
+      #
+      # @param uri [String] the input URI
+      # @return [String] uri unchanged, or "./" + uri when neutralization applies
+      # @api private
+      def neutralize_protocol_relative(uri)
+        return uri unless @options.base_uri? || @options.persistent?
+        return uri unless uri.start_with?("//")
+
+        "./#{uri}"
+      end
+
       # Resolve a relative URI against the configured base URI
       #
       # Ensures the base URI path has a trailing slash so that relative

data/lib/http/response.rb

@@ -337,9 +337,9 @@ module HTTP
     # @return [HTTP::Request]
     # @api private
     def init_request(request, uri)
-      raise ArgumentError, ":uri is for backwards compatibilty and conflicts with :request" if request && uri
+      raise ArgumentError, ":uri is for backwards compatibility and conflicts with :request" if request && uri
 
-      # For backwards compatibilty
+      # For backwards compatibility
       if uri
         HTTP::Request.new(uri: uri, verb: :get)
       else

data/lib/http/timeout/null.rb

@@ -185,12 +185,14 @@ module HTTP
       # @return [Object] the connected socket
       # @api private
       def open_socket(socket_class, host, port, connect_timeout: nil)
-        if connect_timeout
+        return socket_class.open(host, port) unless connect_timeout
+
+        if native_timeout?(socket_class)
+          open_with_timeout(socket_class, host, port, connect_timeout)
+        else
           ::Timeout.timeout(connect_timeout, ConnectTimeoutError) do
             open_with_timeout(socket_class, host, port, connect_timeout)
           end
-        else
-          socket_class.open(host, port)
         end
       rescue IO::TimeoutError
         raise ConnectTimeoutError, "Connect timed out after #{connect_timeout} seconds"

data/lib/http/version.rb

@@ -2,5 +2,5 @@
 
 module HTTP
   # Current library version
-  VERSION = "6.0.3"
+  VERSION = "6.0.4"
 end

data/sig/http.rbs

@@ -818,6 +818,7 @@ module HTTP
       private
 
       def make_request_uri: (String | URI uri) -> URI
+      def neutralize_protocol_relative: (String uri) -> String
       def resolve_against_base: (String uri) -> String
       def merge_query_params!: (URI uri) -> void
       def make_request_headers: () -> Headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
 platform: java
 authors:
 - Tony Arcieri
@@ -120,10 +120,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/httprb/http
-  source_code_uri: https://github.com/httprb/http/tree/v6.0.3
+  source_code_uri: https://github.com/httprb/http/tree/v6.0.4
   bug_tracker_uri: https://github.com/httprb/http/issues
-  changelog_uri: https://github.com/httprb/http/blob/v6.0.3/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/http/6.0.3
+  changelog_uri: https://github.com/httprb/http/blob/v6.0.4/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/http/6.0.4
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: HTTP should be easy
 test_files: []