ethon 0.11.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac54c9df1c6dfd22a65124a64c7bb93b2792dc55
-  data.tar.gz: 5fedd427db76181d6bde8c7c4af4116bdf1cc272
+SHA256:
+  metadata.gz: 30f75feeae963db1b4648a0b88e028361c78fda7aec43524a35f93b287ab2305
+  data.tar.gz: eb0ccd002c324dedaaceaa001172a61c520cd58e34d1a92440182faada17df74
 SHA512:
-  metadata.gz: 538f6d8f6af52a294d72ecc3f63f8a2a7ed97f90154382979edfbdc6085f38e16ea4e336f1cdff3d107551402ba2408b87f8632added41b2915744b97da47c3c
-  data.tar.gz: 54695f47f42ea0838c8da9531d136b52d6d77a8e5cd10374929c878b6ff55f572727d1e8afa3b854672ba6bbbcb5eff1d0d25091bc6d5f1ad6df0d757eeecb6e
+  metadata.gz: b6ec09378cd37ec552caee9a9153fb9e0582a770b18da882ec27f59028799885e1a9d9d7c496f1cfb4803ba3eb14bdd5e508f930cdc9523d16747d2a87ba1dfb
+  data.tar.gz: 77a50827108e8c6bc44f293bae5c2bfe6e871c94f40f93904ff611245143ef7900cf4cc2aa8a1511d0797dd80c03578e06b4e256f929deab544c73f9ef0d9e33

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]
+    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 update && sudo apt install -y --no-install-recommends 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/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 .yardoc
 doc
 coverage
+.idea

data/CHANGELOG.md

@@ -2,7 +2,25 @@
 
 ## Master
 
-[Full Changelog](https://github.com/typhoeus/ethon/compare/v0.10.1...master)
+[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)
+
+## 0.12.0
+
+[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)
 
 ## 0.10.1
 

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
 
@@ -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/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/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:
@@ -31,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/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:
@@ -58,5 +59,22 @@ module Ethon
     VERSION_NTLM_WB = (1<<15) # NTLM delegating to winbind helper
     VERSION_HTTP2 = (1<<16) # HTTP2 support built
     VERSION_GSSAPI = (1<<17) # GSS-API is supported
+
+    SOCKET_BAD = -1
+    SOCKET_TIMEOUT = SOCKET_BAD
+
+    PollAction = enum(:poll_action, [
+      :none,
+      :in,
+      :out,
+      :inout,
+      :remove
+    ])
+
+    SocketReadiness = bitmask(:socket_readiness, [
+      :in,  # CURL_CSELECT_IN  - 0x01 (bit 0)
+      :out, # CURL_CSELECT_OUT - 0x02 (bit 1)
+      :err, # CURL_CSELECT_ERR - 0x04 (bit 2)
+    ])
   end
 end

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,8 @@ 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 :multi_socket_action,        :curl_multi_socket_action, [:pointer, :int, :socket_readiness, :pointer], :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,32 @@ 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 :socket_callback
+          va_type=:socket_callback
+          raise Errors::InvalidValue.new(option,value) unless value.nil? or value.is_a? Proc
+        when :timer_callback
+          va_type=:timer_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 = {
@@ -138,6 +143,8 @@ module Ethon
         :dontuse_object => :objectpoint, # An object we don't support (e.g. FILE*)
         :cbdata => :objectpoint,
         :callback => :functionpoint,
+        :socket_callback => :functionpoint,
+        :timer_callback => :functionpoint,
         :debug_callback => :functionpoint,
         :progress_callback => :functionpoint,
         :off_t => :off_t,
@@ -209,10 +216,10 @@ module Ethon
       # Documentation @ http://curl.haxx.se/libcurl/c/curl_multi_setopt.html
       option_type :multi
 
-      option :multi, :socketfunction, :callback, 1
+      option :multi, :socketfunction, :socket_callback, 1
       option :multi, :socketdata, :cbdata, 2
-      option :multi, :pipelining, :bool, 3
-      option :multi, :timerfunction, :callback, 4
+      option :multi, :pipelining, :int, 3
+      option :multi, :timerfunction, :timer_callback, 4
       option :multi, :timerdata, :cbdata, 5
       option :multi, :maxconnects, :int, 6
       option :multi, :max_host_connections, :int, 7
@@ -251,6 +258,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
@@ -282,7 +290,7 @@ module Ethon
       option :easy, :redir_protocols, :bitmask, 182, [nil, :http, :https, :ftp, :ftps, :scp, :sftp, :telnet, :ldap, :ldaps, :dict, :file, :tftp, :imap, :imaps, :pop3, :pop3s, :smtp, :smtps, :rtsp, :rtmp, :rtmpt, :rtmpe, :rtmpte, :rtmps, :rtmpts, :gopher]
       option :easy, :proxy, :string, 4
       option :easy, :proxyport, :int, 59
-      option :easy, :proxytype, :enum, 101, [:http, :http_1_0, nil, nil, :socks4, :socks5, :socks4a, :socks5_hostname]
+      option :easy, :proxytype, :enum, 101, [:http, :http_1_0, :https, nil, :socks4, :socks5, :socks4a, :socks5_hostname]
       option :easy, :noproxy, :string, 177
       option :easy, :httpproxytunnel, :bool, 61
       option :easy, :socks5_gssapi_service, :string, 179
@@ -292,10 +300,14 @@ module Ethon
       option :easy, :localportrange, :int, 140
       option :easy, :dns_cache_timeout, :int, 92
       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
       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
@@ -341,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
@@ -417,6 +429,7 @@ module Ethon
       option :easy, :dns_servers, :string, 211
       option :easy, :accepttimeout_ms, :int, 212
       option :easy, :unix_socket_path, :string, 231
+      option :easy, :pipewait, :bool, 237
       option_alias :easy, :unix_socket_path, :unix_socket
       ## SSL and SECURITY OPTIONS
       option :easy, :sslcert, :string, 25
@@ -428,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
@@ -444,6 +457,31 @@ 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
+      ## PROXY SSL OPTIONS
+      option :easy, :proxy_cainfo, :string, 246
+      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, :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]
+      option :easy, :proxy_sslcert, :string, 254
+      option :easy, :proxy_sslcerttype, :string, 255
+      option :easy, :proxy_sslkey, :string, 256
+      option :easy, :proxy_sslkeytype, :string, 257
+      option :easy, :proxy_keypasswd, :string, 258
+      option_alias :easy, :proxy_keypasswd, :proxy_sslcertpasswd
+      option_alias :easy, :proxy_keypasswd, :proxy_sslkeypasswd
+      option :easy, :proxy_ssl_cipher_list, :string, 259
+      option :easy, :proxy_crlfile, :string, 260
+      option :easy, :proxy_ssl_options, :bitmask, 261, [nil, :allow_beast]
+      option :easy, :pre_proxy, :string, 262
+      option :easy, :proxy_pinnedpublickey, :string, 263
+      option_alias :easy, :proxy_pinnedpublickey, :proxy_pinned_public_key
+      option :easy, :proxy_issuercert, :string, 296
       ## 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,6 +1,9 @@
+# frozen_string_literal: true
 module Ethon
   module Curl
     callback :callback, [:pointer, :size_t, :size_t, :pointer], :size_t
+    callback :socket_callback, [:pointer, :int, :poll_action, :pointer, :pointer], :multi_code
+    callback :timer_callback, [:pointer, :long, :pointer], :multi_code
     callback :debug_callback, [:pointer, :debug_info_type, :pointer, :size_t, :pointer], :int
     callback :progress_callback, [:pointer, :long_long, :long_long, :long_long, :long_long], :int
     ffi_lib_flags :now, :global

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
@@ -51,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
 
@@ -60,7 +62,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/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