ethon 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b0080762fbe70bea3b3d5717749a8afb60feb1d843543fc313705dc245b2b8
-  data.tar.gz: fab2787f5a0eebd10ed2d6004ba9b6e3cdc5b60f776e9e5ee0d811529a9a50c6
+  metadata.gz: 30f75feeae963db1b4648a0b88e028361c78fda7aec43524a35f93b287ab2305
+  data.tar.gz: eb0ccd002c324dedaaceaa001172a61c520cd58e34d1a92440182faada17df74
 SHA512:
-  metadata.gz: c8d9d0214408c48e702b0d8256d5d6c9d62540d57b9ce142c4a90ff667bbf4db4661e9423ce372d0652c9df4b0147110c3dcc2f317418d3b0e33fe245b4b876b
-  data.tar.gz: 1d351ae5e4b45e736a7eef6d4068cec779bfba6a71097c102a3998315aa391789d86725b173eafc5f15d55e587730334ec6c1eb60d4c5eb63b3cacbd11ddddb1
+  metadata.gz: b6ec09378cd37ec552caee9a9153fb9e0582a770b18da882ec27f59028799885e1a9d9d7c496f1cfb4803ba3eb14bdd5e508f930cdc9523d16747d2a87ba1dfb
+  data.tar.gz: 77a50827108e8c6bc44f293bae5c2bfe6e871c94f40f93904ff611245143ef7900cf4cc2aa8a1511d0797dd80c03578e06b4e256f929deab544c73f9ef0d9e33

data/.github/workflows/ruby.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        ruby-version: [2.5, 2.6, 2.7, 3.0, head, debug, truffleruby, truffleruby-head]
+        ruby-version: [2.5, 2.6, 2.7, 3.0, head, debug, truffleruby]
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
     - uses: actions/checkout@v2
@@ -30,7 +30,7 @@ jobs:
         then
           brew install curl
         else
-          sudo apt install -y libcurl4-openssl-dev
+          sudo apt update && sudo apt install -y --no-install-recommends libcurl4-openssl-dev
         fi
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -4,6 +4,9 @@
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.15.0...master)
 
+* Added `redirect_url` value to available informations and `Easy::Mirror`.
+  ([Adrien Rey-Jarthon](https://github.com/jarthod)
+
 ## 0.15.0
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.14.0...v0.15.0)

data/README.md

@@ -70,6 +70,29 @@ easy.perform
 This is really handy when making requests since you don't have to care about setting
 everything up correctly.
 
+## Http2
+Standard http2 servers require the client to connect once and create a session (multi) and then add simple requests to the multi handler.
+The `perform` method then takes all the requests in the multi handler and sends them to the server.
+
+See the following example
+```ruby
+multi = Ethon::Multi.new
+easy = Ethon::Easy.new
+
+easy.http_request("www.example.com/get", :get, { http_version: :httpv2_0 })
+
+# Sending a request with http version 2 will send an Upgrade header to the server, which many older servers will not support
+# See below for more info: https://everything.curl.dev/http/http2
+# If this is a problem, send the below:
+easy.http_request("www.example.com/get", :get, { http_version: :httpv2_prior_knowledge })
+
+# To set the server to use http2 with https and http1 with http, send the following:
+easy.http_request("www.example.com/get", :get, { http_version: :httpv2_tls }
+
+multi.add(easy)
+multi.perform
+```
+
 ##  LICENSE
 
 (The MIT License)

data/lib/ethon/curls/classes.rb

@@ -32,8 +32,18 @@ module Ethon
 
         def clear; self[:fd_count] = 0; end
       else
-        # FD Set size.
-        FD_SETSIZE = ::Ethon::Libc.getdtablesize
+        # https://github.com/typhoeus/ethon/issues/182
+        FD_SETSIZE = begin
+          # Allow to override the (new) default cap
+          if ENV['ETHON_FD_SIZE']
+            ENV['ETHON_FD_SIZE']
+
+          # auto-detect ulimit, but cap at 2^16
+          else
+            [::Ethon::Libc.getdtablesize, 65_536].min
+          end
+        end
+
         layout :fds_bits, [:long, FD_SETSIZE / ::FFI::Type::LONG.size]
 
         # :nodoc:

data/lib/ethon/curls/options.rb

@@ -307,6 +307,7 @@ module Ethon
       option :easy, :port, :int, 3
       option :easy, :tcp_nodelay, :bool, 121
       option :easy, :address_scope, :int, 171
+      option :easy, :tcp_fastopen, :bool, 212
       option :easy, :tcp_keepalive, :bool, 213
       option :easy, :tcp_keepidle, :int, 214
       option :easy, :tcp_keepintvl, :int, 215
@@ -352,7 +353,7 @@ module Ethon
       option :easy, :cookiesession, :bool, 96
       option :easy, :cookielist, :string, 135
       option :easy, :httpget, :bool, 80
-      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1, :httpv2_0]
+      option :easy, :http_version, :enum, 84, [:none, :httpv1_0, :httpv1_1, :httpv2_0, :httpv2_tls, :httpv2_prior_knowledge]
       option :easy, :ignore_content_length, :bool, 136
       option :easy, :http_content_decoding, :bool, 158
       option :easy, :http_transfer_decoding, :bool, 157
@@ -440,7 +441,7 @@ module Ethon
       option_alias :easy, :keypasswd, :sslkeypasswd
       option :easy, :sslengine, :string, 89
       option :easy, :sslengine_default, :none, 90
-      option :easy, :sslversion, :enum, 32, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2]
+      option :easy, :sslversion, :enum, 32, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2, :tlsv1_3]
       option :easy, :ssl_verifypeer, :bool, 64
       option :easy, :cainfo, :string, 65
       option :easy, :issuercert, :string, 170
@@ -463,7 +464,7 @@ module Ethon
       option :easy, :proxy_capath, :string, 247
       option :easy, :proxy_ssl_verifypeer, :bool, 248
       option :easy, :proxy_ssl_verifyhost, :int, 249
-      option :easy, :proxy_sslversion, :enum, 250, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2]
+      option :easy, :proxy_sslversion, :enum, 250, [:default, :tlsv1, :sslv2, :sslv3, :tlsv1_0, :tlsv1_1, :tlsv1_2, :tlsv1_3]
       option :easy, :proxy_tlsauth_username, :string, 251
       option :easy, :proxy_tlsauth_password, :string, 252
       option :easy, :proxy_tlsauth_type, :enum, 253, [:none, :srp]

data/lib/ethon/easy/callbacks.rb

@@ -52,8 +52,9 @@ module Ethon
       # @return [ Proc ] The callback.
       def header_write_callback
         @header_write_callback ||= proc {|stream, size, num, object|
+          result = headers
           @response_headers << stream.read_string(size * num)
-          size * num
+          result != :abort ? size * num : -1
         }
       end
 

data/lib/ethon/easy/informations.rb

@@ -73,6 +73,9 @@ module Ethon
         # actually followed.
         :redirect_count => :long,
 
+        # URL a redirect would take you to, had you enabled redirects (Added in 7.18.2)
+        :redirect_url => :string,
+
         # Return the bytes, the total amount of bytes that were uploaded
         :size_upload => :double,
 

data/lib/ethon/easy/response_callbacks.rb

@@ -43,7 +43,12 @@ module Ethon
         return if @headers_called
         @headers_called = true
         if defined?(@on_headers) and not @on_headers.nil?
-          @on_headers.each{ |callback| callback.call(self) }
+          result = nil
+          @on_headers.each do |callback|
+            result = callback.call(self)
+            break if result == :abort
+          end
+          result
         end
       end
 

data/lib/ethon/version.rb

@@ -2,5 +2,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/spec/ethon/easy/callbacks_spec.rb

@@ -56,4 +56,26 @@ describe Ethon::Easy::Callbacks do
       end
     end
   end
+
+  describe "#header_write_callback" do
+    let(:header_write_callback) { easy.instance_variable_get(:@header_write_callback) }
+    let(:stream) { double(:read_string => "") }
+    context "when header returns not :abort" do
+      it "returns number bigger than 0" do
+        expect(header_write_callback.call(stream, 1, 1, nil) > 0).to be(true)
+      end
+    end
+
+    context "when header returns :abort" do
+      before do
+        easy.on_headers.clear
+        easy.on_headers { :abort }
+      end
+      let(:header_write_callback) { easy.instance_variable_get(:@header_write_callback) }
+
+      it "returns -1 to indicate abort to libcurl" do
+        expect(header_write_callback.call(stream, 1, 1, nil)).to eq(-1)
+      end
+    end
+  end
 end

data/spec/ethon/easy/informations_spec.rb

@@ -81,6 +81,12 @@ describe Ethon::Easy::Informations do
     end
   end
 
+  describe "#redirect_url" do
+    it "returns nil as there is no redirect" do
+      expect(easy.redirect_url).to be(nil)
+    end
+  end
+
   describe "#request_size" do
     it "returns 53" do
       expect(easy.request_size).to eq(53)

data/spec/ethon/easy/mirror_spec.rb

@@ -11,7 +11,7 @@ describe Ethon::Easy::Mirror do
       :total_time, :starttransfer_time, :appconnect_time,
       :pretransfer_time, :connect_time, :namelookup_time, :redirect_time,
       :size_upload, :size_download, :speed_upload, :speed_upload,
-      :effective_url, :primary_ip, :redirect_count, :debug_info
+      :effective_url, :primary_ip, :redirect_count, :redirect_url, :debug_info
     ].each do |name|
       it "contains #{name}" do
         expect(described_class::INFORMATIONS_TO_MIRROR).to include(name)

data/spec/ethon/easy/operations_spec.rb

@@ -106,6 +106,7 @@ describe Ethon::Easy::Operations do
 
         it "doesn't follow" do
           expect(easy.response_code).to eq(302)
+          expect(easy.redirect_url).to eq("http://localhost:3001/")
         end
       end
 
@@ -115,6 +116,7 @@ describe Ethon::Easy::Operations do
 
         it "follows" do
           expect(easy.response_code).to eq(200)
+          expect(easy.redirect_url).to eq(nil)
         end
 
         context "when infinite redirect loop" do
@@ -124,6 +126,7 @@ describe Ethon::Easy::Operations do
           context "when max redirect set" do
             it "follows only x times" do
               expect(easy.response_code).to eq(302)
+              expect(easy.redirect_url).to eq("http://localhost:3001/bad_redirect")
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Hans Hasselberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -137,7 +137,7 @@ homepage: https://github.com/typhoeus/ethon
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +152,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Libcurl wrapper.
 test_files: