ethon 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d849b2843c88fd4277aac9caa8b9e50b93ec7d3cf7805c4eb3c06dcfb6ee9959
-  data.tar.gz: 61b75662bc26c23ce525eb7b98ea2404308d3cd1c6912e92b7acbedabaf95944
+  metadata.gz: 558abec878f87a7e13113e513faf1dc5970cfcc12d3b0a8d4faaec50e847e1c9
+  data.tar.gz: 979dbda54e8b12f1a93fee6bb16db05c1960719f44c7d2152e5d9aaddd783d4e
 SHA512:
-  metadata.gz: c586fb2b19fa35183ee81aaa685ddae7cbebbe55c80166dc20256f6d14181cfc15fe31f88b8951f474d05be77246201c24a8b27dc92a10c0ac177842f4d4c522
-  data.tar.gz: ef4b60756f41c27873cc8c4e7d7ab1d140ec24b6940dedcafc2920d7d7fa5d11e06a437e39c38742b4ac2e7041ad89f1b49f68566b5b90063cbf581b0efc78b2
+  metadata.gz: 63339cb7a38df43138df7fb52c88d8764d7b1f04bea134781338a676a6a567e8850b9ef24f5db1268a126f9d43b31f6d0ecc6b1441bd8bb6ef7572e7d2c366bd
+  data.tar.gz: f516c95eb23a3dd70d4ee25e76bd100d2cb5d2cf38fd8d626c584c2b71e9307084b0d07598d01c595447c5b241b50a58259aca7da29cdc65db404ebf9fb622f7

data/.github/workflows/ruby.yml

@@ -0,0 +1,41 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, macos]
+        ruby-version: [2.5, 2.6, 2.7, 3.0, head, debug, truffleruby, truffleruby-head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install libcurl header
+      run: |
+        if ${{ matrix.os == 'macos' }}
+        then
+          brew install curl
+        else
+          sudo apt install -y libcurl4-openssl-dev
+        fi
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -8,6 +8,9 @@
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.11.0...v0.12.0)
 
+- Removed deprecated `CURLE_SSL_CACERT` pinned in curl v7.62.0 ([@arku](https://github.com/arku) in [#158](https://github.com/typhoeus/ethon/pull/158))
+
+
 ## 0.11.0
 
 [Full Changelog](https://github.com/typhoeus/ethon/compare/v0.10.1...v0.11.0)

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 gemspec
 
@@ -29,6 +30,10 @@ group :development, :test do
   elsif Gem.ruby_version >= Gem::Version.new("2.0.0")
     gem "mustermann", "0.3.1"
   end
+
+  if Gem.ruby_version >= Gem::Version.new("3.0.0")
+    gem "webrick"
+  end
 end
 
 group :perf do

data/Guardfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # vim:set filetype=ruby:
 guard(
   "rspec",

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/ethon.svg)](https://badge.fury.io/rb/ethon)
-[![Build Status](https://travis-ci.org/typhoeus/ethon.svg?branch=master)](https://travis-ci.org/typhoeus/ethon)
+[![Build Status](https://github.com/typhoeus/ethon/workflows/Ruby/badge.svg)](https://github.com/typhoeus/ethon/actions/workflows/ruby.yml)
 
 #  Ethon
 

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler"
 Bundler.setup
 

data/ethon.gemspec

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
@@ -17,7 +18,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.license = 'MIT'
 
-  s.add_dependency('ffi', ['>= 1.3.0'])
+  s.add_dependency('ffi', ['>= 1.15.0'])
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")

data/lib/ethon.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
 require 'logger'
 require 'ffi'
+require 'ffi/tools/const_generator'
 require 'thread'
 begin
   require 'mime/types/columnar'

data/lib/ethon/curl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/curls/codes'
 require 'ethon/curls/options'
 require 'ethon/curls/infos'

data/lib/ethon/curls/classes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     # :nodoc:
@@ -32,7 +33,7 @@ module Ethon
         def clear; self[:fd_count] = 0; end
       else
         # FD Set size.
-        FD_SETSIZE = ::Ethon::Libc.getdtablesize
+        FD_SETSIZE = ::Ethon::Libc.sysconf(:open_max)
         layout :fds_bits, [:long, FD_SETSIZE / ::FFI::Type::LONG.size]
 
         # :nodoc:

data/lib/ethon/curls/codes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls # :nodoc:
 
@@ -69,7 +70,6 @@ module Ethon
           :obsolete57,
           :ssl_certproblem,
           :ssl_cipher,
-          :ssl_cacert,
           :bad_content_encoding,
           :ldap_invalid_url,
           :filesize_exceeded,

data/lib/ethon/curls/constants.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     # :nodoc:

data/lib/ethon/curls/form_options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 

data/lib/ethon/curls/functions.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 
@@ -13,14 +14,8 @@ module Ethon
 
         base.attach_function :easy_init,                  :curl_easy_init,           [],                             :pointer
         base.attach_function :easy_cleanup,               :curl_easy_cleanup,        [:pointer],                     :void
-        base.attach_function :easy_getinfo,               :curl_easy_getinfo,        [:pointer, :info, :pointer],    :easy_code
-        base.attach_function :easy_setopt_ffipointer,     :curl_easy_setopt,         [:pointer, :easy_option, :pointer],  :easy_code
-        base.attach_function :easy_setopt_string,         :curl_easy_setopt,         [:pointer, :easy_option, :string],   :easy_code
-        base.attach_function :easy_setopt_long,           :curl_easy_setopt,         [:pointer, :easy_option, :long],     :easy_code
-        base.attach_function :easy_setopt_callback,       :curl_easy_setopt,         [:pointer, :easy_option, :callback], :easy_code
-        base.attach_function :easy_setopt_debug_callback, :curl_easy_setopt,         [:pointer, :easy_option, :debug_callback], :easy_code
-        base.attach_function :easy_setopt_progress_callback, :curl_easy_setopt,      [:pointer, :easy_option, :progress_callback], :easy_code
-        base.attach_function :easy_setopt_off_t,          :curl_easy_setopt,         [:pointer, :easy_option, :int64],    :easy_code
+        base.attach_function :easy_getinfo,               :curl_easy_getinfo,        [:pointer, :info, :varargs],    :easy_code
+        base.attach_function :easy_setopt,                :curl_easy_setopt,         [:pointer, :easy_option, :varargs], :easy_code
         base.instance_variable_set(:@blocking, true)
         base.attach_function :easy_perform,               :curl_easy_perform,        [:pointer],                     :easy_code
         base.attach_function :easy_strerror,              :curl_easy_strerror,       [:easy_code],                   :string
@@ -40,11 +35,7 @@ module Ethon
         base.attach_function :multi_timeout,              :curl_multi_timeout,       [:pointer, :pointer],           :multi_code
         base.attach_function :multi_fdset,                :curl_multi_fdset,         [:pointer, Curl::FDSet.ptr, Curl::FDSet.ptr, Curl::FDSet.ptr, :pointer], :multi_code
         base.attach_function :multi_strerror,             :curl_multi_strerror,      [:int],                         :string
-        base.attach_function :multi_setopt_ffipointer,    :curl_multi_setopt,        [:pointer, :multi_option, :pointer],  :multi_code
-        base.attach_function :multi_setopt_string,        :curl_multi_setopt,        [:pointer, :multi_option, :string],   :multi_code
-        base.attach_function :multi_setopt_long,          :curl_multi_setopt,        [:pointer, :multi_option, :long],     :multi_code
-        base.attach_function :multi_setopt_callback,      :curl_multi_setopt,        [:pointer, :multi_option, :callback], :multi_code
-        base.attach_function :multi_setopt_off_t,         :curl_multi_setopt,        [:pointer, :multi_option, :int64],    :multi_code
+        base.attach_function :multi_setopt,               :curl_multi_setopt,        [:pointer, :multi_option, :varargs], :multi_code
 
         base.attach_function :version,                    :curl_version,             [],                             :string
         base.attach_function :version_info,               :curl_version_info,        [],                             Curl::VersionInfoData.ptr

data/lib/ethon/curls/infos.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 
@@ -106,7 +107,7 @@ module Ethon
       def get_info_string(option, handle)
         string_ptr = ::FFI::MemoryPointer.new(:pointer)
 
-        if easy_getinfo(handle, option, string_ptr) == :ok
+        if easy_getinfo(handle, option, :pointer, string_ptr) == :ok
           ptr=string_ptr.read_pointer
           ptr.null? ? nil : ptr.read_string
         end
@@ -124,7 +125,7 @@ module Ethon
       def get_info_long(option, handle)
         long_ptr = ::FFI::MemoryPointer.new(:long)
 
-        if easy_getinfo(handle, option, long_ptr) == :ok
+        if easy_getinfo(handle, option, :pointer, long_ptr) == :ok
           long_ptr.read_long
         end
       end
@@ -141,7 +142,7 @@ module Ethon
       def get_info_double(option, handle)
         double_ptr = ::FFI::MemoryPointer.new(:double)
 
-        if easy_getinfo(handle, option, double_ptr) == :ok
+        if easy_getinfo(handle, option, :pointer, double_ptr) == :ok
           double_ptr.read_double
         end
       end

data/lib/ethon/curls/messages.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 

data/lib/ethon/curls/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curls
 
@@ -7,8 +8,7 @@ module Ethon
 
       OPTION_STRINGS = { :easy => 'easy_options', :multi => 'multi_options' }.freeze
       FOPTION_STRINGS = { :easy => 'EASY_OPTIONS', :multi => 'MULTI_OPTIONS' }.freeze
-      FTYPES = [:long, :string, :ffipointer, :callback, :debug_callback, :progress_callback, :off_t]
-      FUNCS = Hash[*[:easy, :multi].zip([:easy, :multi].map { |t| Hash[*FTYPES.zip(FTYPES.map { |ft| "#{t}_setopt_#{ft}" }).flatten] }).flatten]
+      FUNCS = { :easy => 'easy_setopt', :multi => 'multi_setopt' }.freeze
       # Sets appropriate option for easy, depending on value type.
       def set_option(option, value, handle, type = :easy)
         type = type.to_sym unless type.is_a?(Symbol)
@@ -20,22 +20,22 @@ module Ethon
         when :none
           return if value.nil?
           value=1
-          func=:long
+          va_type=:long
         when :int
           return if value.nil?
-          func=:long
+          va_type=:long
           value=value.to_i
         when :bool
           return if value.nil?
-          func=:long
+          va_type=:long
           value=(value&&value!=0) ? 1 : 0
         when :time
           return if value.nil?
-          func=:long
+          va_type=:long
           value=value.to_i
         when :enum
           return if value.nil?
-          func=:long
+          va_type=:long
           value = case value
           when Symbol
             opthash[option][:opts][value]
@@ -46,7 +46,7 @@ module Ethon
           end.to_i
         when :bitmask
           return if value.nil?
-          func=:long
+          va_type=:long
           value = case value
           when Symbol
             opthash[option][:opts][value]
@@ -56,22 +56,22 @@ module Ethon
             value
           end.to_i
         when :string
-          func=:string
+          va_type=:string
           value=value.to_s unless value.nil?
         when :string_as_pointer
-          func = :ffipointer
+          va_type = :pointer
           s = ''
           s = value.to_s unless value.nil?
           value = FFI::MemoryPointer.new(:char, s.bytesize)
           value.put_bytes(0, s)
         when :string_escape_null
-          func=:string
+          va_type=:string
           value=Util.escape_zero_byte(value) unless value.nil?
         when :ffipointer
-          func=:ffipointer
+          va_type=:pointer
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? FFI::Pointer
         when :curl_slist
-          func=:ffipointer
+          va_type=:pointer
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? FFI::Pointer
         when :buffer
           raise NotImplementedError, "Ethon::Curls::Options option #{option} buffer type not implemented."
@@ -80,27 +80,26 @@ module Ethon
         when :cbdata
           raise NotImplementedError, "Ethon::Curls::Options option #{option} callback data type not implemented. Use Ruby closures."
         when :callback
-          func=:callback
+          va_type=:callback
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
         when :debug_callback
-          func=:debug_callback
+          va_type=:debug_callback
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
         when :progress_callback
-          func=:progress_callback
+          va_type=:progress_callback
           raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
         when :off_t
           return if value.nil?
-          func=:off_t
+          va_type=:int64
           value=value.to_i
         end
 
-        if func==:long or func==:off_t then
-            bits=FFI.type_size(:long)*8 if func==:long
-            bits=FFI.type_size(:int64)*8 if func==:off_t
+        if va_type==:long or va_type==:int64 then
+            bits=FFI.type_size(va_type)*8
             tv=((value<0) ? value.abs-1 : value)
             raise Errors::InvalidValue.new(option,value) unless tv<(1<<bits)
         end
-        send(FUNCS[type][func], handle, opthash[option][:opt], value)
+        send(FUNCS[type], handle, opthash[option][:opt], va_type, value)
       end
 
       OPTION_TYPE_BASE = {
@@ -251,6 +250,7 @@ module Ethon
       option :easy, :opensocketdata, :cbdata, 164
       option :easy, :closesocketfunction, :callback, 208
       option :easy, :closesocketdata, :cbdata, 209
+      option :easy, :path_as_is, :bool, 234
       option :easy, :progressfunction, :progress_callback, 56
       option :easy, :progressdata, :cbdata, 57
       option :easy, :headerfunction, :callback, 79
@@ -294,6 +294,7 @@ module Ethon
       option :easy, :dns_use_global_cache, :bool, 91 # Obsolete
       option :easy, :dns_interface, :string, 221
       option :easy, :dns_local_ip4, :string, 222
+      option :easy, :dns_shuffle_addresses, :bool, 275
       option :easy, :buffersize, :int, 98
       option :easy, :port, :int, 3
       option :easy, :tcp_nodelay, :bool, 121
@@ -447,6 +448,8 @@ module Ethon
       option :easy, :krblevel, :string, 63
       option_alias :easy, :krblevel, :krb4level
       option :easy, :gssapi_delegation, :bitmask, 210, [:none, :policy_flag, :flag]
+      option :easy, :pinnedpublickey, :string, 230
+      option_alias :easy, :pinnedpublickey, :pinned_public_key
       ## SSH OPTIONS
       option :easy, :ssh_auth_types, :bitmask, 151, [:none, :publickey, :password, :host, :keyboard, :agent, {:any => [:all], :default => [:any]}]
       option :easy, :ssh_host_public_key_md5, :string, 162

data/lib/ethon/curls/settings.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     callback :callback, [:pointer, :size_t, :size_t, :pointer], :size_t

data/lib/ethon/easy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/informations'
 require 'ethon/easy/features'
 require 'ethon/easy/callbacks'
@@ -159,7 +160,6 @@ module Ethon
     #   * :recv_error: Failure with receiving network data.
     #   * :ssl_certproblem: problem with the local client certificate.
     #   * :ssl_cipher: Couldn't use specified cipher.
-    #   * :ssl_cacert: Peer certificate cannot be authenticated with known CA certificates.
     #   * :bad_content_encoding: Unrecognized transfer encoding.
     #   * :ldap_invalid_url: Invalid LDAP URL.
     #   * :filesize_exceeded: Maximum file size exceeded.

data/lib/ethon/easy/callbacks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 
@@ -22,8 +23,8 @@ module Ethon
         Curl.set_option(:writefunction, body_write_callback, handle)
         Curl.set_option(:headerfunction, header_write_callback, handle)
         Curl.set_option(:debugfunction, debug_callback, handle)
-        @response_body = ""
-        @response_headers = ""
+        @response_body = String.new
+        @response_headers = String.new
         @headers_called = false
         @debug_info = Ethon::Easy::DebugInfo.new
       end
@@ -60,7 +61,7 @@ module Ethon
       # write the raw http request headers.
       #
       # @example Return the callback.
-      #   easy.body_write_callback
+      #   easy.debug_callback
       #
       # @return [ Proc ] The callback.
       def debug_callback

data/lib/ethon/easy/debug_info.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/features.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/util'
 require 'ethon/easy/queryable'
 

data/lib/ethon/easy/header.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     # This module contains the logic around adding headers to libcurl.

data/lib/ethon/easy/http.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/http/actionable'
 require 'ethon/easy/http/post'
 require 'ethon/easy/http/get'

data/lib/ethon/easy/http/actionable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/http/putable'
 require 'ethon/easy/http/postable'
 

data/lib/ethon/easy/http/custom.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/delete.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/get.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/head.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/patch.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/post.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/postable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/put.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/http/putable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     module Http

data/lib/ethon/easy/informations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/mirror.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     class Mirror

data/lib/ethon/easy/operations.rb

@@ -1,8 +1,23 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
     # This module contains the logic to prepare and perform
     # an easy.
     module Operations
+      
+      class PointerHelper
+        class<<self
+          def synchronize( &block )
+            (@mutex ||= Mutex.new).synchronize( &block )
+          end
+
+          def release( pointer )
+            synchronize { Curl.easy_cleanup pointer }
+          end
+        end
+        synchronize{}
+      end
+
       # Returns a pointer to the curl easy handle.
       #
       # @example Return the handle.
@@ -10,7 +25,7 @@ module Ethon
       #
       # @return [ FFI::Pointer ] A pointer to the curl easy handle.
       def handle
-        @handle ||= FFI::AutoPointer.new(Curl.easy_init, Curl.method(:easy_cleanup))
+        @handle ||= FFI::AutoPointer.new(Curl.easy_init, PointerHelper.method(:release) )
       end
 
       # Sets a pointer to the curl easy handle.

data/lib/ethon/easy/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/params.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/util'
 require 'ethon/easy/queryable'
 

data/lib/ethon/easy/queryable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/response_callbacks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy
 

data/lib/ethon/easy/util.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Easy # :nodoc:
 

data/lib/ethon/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/errors/ethon_error'
 require 'ethon/errors/global_init'
 require 'ethon/errors/multi_timeout'

data/lib/ethon/errors/ethon_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/global_init.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/invalid_option.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/invalid_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_add.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_fdset.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_remove.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/multi_timeout.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/errors/select.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   module Errors
 

data/lib/ethon/libc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
 
   # FFI Wrapper module for Libc.
@@ -13,7 +14,21 @@ module Ethon
     end
 
     unless windows?
-      attach_function :getdtablesize, [], :int
+      fcg = FFI::ConstGenerator.new do |gen|
+        gen.include 'unistd.h'
+        %w[
+          _SC_OPEN_MAX
+        ].each do |const|
+          ruby_name = const.sub(/^_SC_/, '').downcase.to_sym
+          gen.const(const, "%d", nil, ruby_name, &:to_i)
+        end
+      end
+
+      CONF = enum(*fcg.constants.map{|_, const|
+        [const.ruby_name, const.converted_value]
+      }.flatten)
+
+      attach_function :sysconf, [CONF], :long
       attach_function :free, [:pointer], :void
     end
   end

data/lib/ethon/loggable.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 module Ethon
 
   # Contains logging behaviour.

data/lib/ethon/multi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon/easy/util'
 require 'ethon/multi/stack'
 require 'ethon/multi/operations'

data/lib/ethon/multi/operations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Multi # :nodoc
     # This module contains logic to run a multi.

data/lib/ethon/multi/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Multi
 

data/lib/ethon/multi/stack.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Ethon
   class Multi
 

data/lib/ethon/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Ethon
 
   # Ethon version.
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/profile/benchmarks.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'ethon'
 require 'open-uri'
 require 'patron'

data/profile/memory_leaks.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ethon'
 require 'ethon/easy'
 

data/profile/perf_spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #### SETUP
 require 'bundler'
 Bundler.setup

data/profile/support/memory_test_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'ruby_object_leak_tracker'
 require_relative 'os_memory_leak_tracker'
 

data/profile/support/os_memory_leak_tracker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class OSMemoryLeakTracker
   attr_reader :current_run
 

data/profile/support/ruby_object_leak_tracker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class RubyObjectLeakTracker
   attr_reader :previous_count_hash, :current_count_hash
 

data/spec/ethon/curl_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Curl do

data/spec/ethon/easy/callbacks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Callbacks do

data/spec/ethon/easy/debug_info_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::DebugInfo do

data/spec/ethon/easy/features_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Informations do

data/spec/ethon/easy/form_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Form do

data/spec/ethon/easy/header_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Header do

data/spec/ethon/easy/http/custom_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Custom do

data/spec/ethon/easy/http/delete_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Delete do

data/spec/ethon/easy/http/get_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Get do

data/spec/ethon/easy/http/head_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Head do

data/spec/ethon/easy/http/options_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Options do

data/spec/ethon/easy/http/patch_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Patch do

data/spec/ethon/easy/http/post_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Post do

data/spec/ethon/easy/http/put_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http::Put do

data/spec/ethon/easy/http_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Http do

data/spec/ethon/easy/informations_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Informations do

data/spec/ethon/easy/mirror_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Mirror do

data/spec/ethon/easy/operations_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Operations do

data/spec/ethon/easy/options_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Options do
@@ -12,7 +13,7 @@ describe Ethon::Easy::Options do
     :proxyuserpwd, :readdata, :readfunction, :redir_protocols, :ssl_verifyhost,
     :ssl_verifypeer, :sslcert, :sslcerttype, :sslkey, :sslkeytype, :sslversion,
     :timeout, :timeout_ms, :unrestricted_auth, :upload, :url, :useragent,
-    :userpwd, :verbose, :pipewait
+    :userpwd, :verbose, :pipewait, :dns_shuffle_addresses, :path_as_is
   ].each do |name|
     describe "#{name}=" do
       it "responds_to" do

data/spec/ethon/easy/queryable_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Queryable do

data/spec/ethon/easy/response_callbacks_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::ResponseCallbacks do

data/spec/ethon/easy/util_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy::Util do

data/spec/ethon/easy_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Easy do
@@ -106,8 +107,8 @@ describe Ethon::Easy do
       easy.on_complete { 'on_complete' }
       easy.on_headers { 'on_headers' }
       easy.on_progress { 'on_progress' }
-      easy.response_body = 'test_body'
-      easy.response_headers = 'test_headers'
+      easy.response_body = String.new('test_body')
+      easy.response_headers = String.new('test_headers')
       easy
     end
     let!(:e) { easy.dup }

data/spec/ethon/libc_spec.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Libc do
-  describe "#getdtablesize", :if => !Ethon::Curl.windows? do
+  describe "#sysconf(:open_max)", :if => !Ethon::Curl.windows? do
     it "returns an integer" do
-      expect(Ethon::Libc.getdtablesize).to be_a(Integer)
+      expect(Ethon::Libc.sysconf(:open_max)).to be_a(Integer)
     end
 
     it "returns bigger zero", :if => !Ethon::Curl.windows? do
-      expect(Ethon::Libc.getdtablesize).to_not be_zero
+      expect(Ethon::Libc.sysconf(:open_max)).to_not be_zero
     end
   end
 end

data/spec/ethon/loggable_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 describe Ethon::Loggable do

data/spec/ethon/multi/operations_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Multi::Operations do

data/spec/ethon/multi/options_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Multi::Options do

data/spec/ethon/multi/stack_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Multi::Stack do

data/spec/ethon/multi_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Ethon::Multi do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 

data/spec/support/localhost_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rack'
 require 'rack/handler/webrick'
 require 'net/http'
@@ -43,7 +44,7 @@ class LocalhostServer
     # Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
     options = { :Port => port }
     options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['VERBOSE_SERVER']
-    Rack::Handler::WEBrick.run(Identify.new(@rack_app), options)
+    Rack::Handler::WEBrick.run(Identify.new(@rack_app), **options)
   end
 
   def booted?

data/spec/support/server.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require 'json'
 require 'zlib'
 require 'sinatra/base'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.15.0
 description: Very lightweight libcurl wrapper.
 email:
 - me@hans.io
@@ -31,9 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -152,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Libcurl wrapper.

data/.travis.yml

@@ -1,30 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-
-bundler_args: --without perf
-script: bundle exec rake
-before_install:
-  - gem install bundler
-
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0-p648
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
-  - ruby-head
-  - ree
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ree
-    - rvm: ruby-head
-    - rvm: jruby-head