ethon 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558abec878f87a7e13113e513faf1dc5970cfcc12d3b0a8d4faaec50e847e1c9
-  data.tar.gz: 979dbda54e8b12f1a93fee6bb16db05c1960719f44c7d2152e5d9aaddd783d4e
+  metadata.gz: 87e1825a32b82c558aded416768e7dffc8a1be6918bca888187b343e17159432
+  data.tar.gz: 4773483d3d4e5bf46298d55c4d4967622666bf28f6665445d621ab2b4de30213
 SHA512:
-  metadata.gz: 63339cb7a38df43138df7fb52c88d8764d7b1f04bea134781338a676a6a567e8850b9ef24f5db1268a126f9d43b31f6d0ecc6b1441bd8bb6ef7572e7d2c366bd
-  data.tar.gz: f516c95eb23a3dd70d4ee25e76bd100d2cb5d2cf38fd8d626c584c2b71e9307084b0d07598d01c595447c5b241b50a58259aca7da29cdc65db404ebf9fb622f7
+  metadata.gz: bc51f162c86e89ddc1176368a508870e0be217a11027ae17d93149cbc04ae822d2d03ce6e2fa0e15269bbafefbda9e2dbfd1e64aba0b4e3fddbf820b958a3b82
+  data.tar.gz: 8c755c396544992d6062fe28f3a7a741c3269941665e89995a5f5060d08b4ed8d4f5768bc0601efa7780b1407c49d1839e4557f3ac591abc0529438ad8506163

data/lib/ethon.rb

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

data/lib/ethon/curls/classes.rb

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

data/lib/ethon/curls/options.rb

@@ -282,7 +282,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

data/lib/ethon/libc.rb

@@ -14,21 +14,7 @@ module Ethon
     end
 
     unless windows?
-      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 :getdtablesize, [], :int
       attach_function :free, [:pointer], :void
     end
   end

data/lib/ethon/multi/options.rb

@@ -9,7 +9,7 @@ module Ethon
       # Sets max_total_connections option.
       #
       # @example Set max_total_connections option.
-      #   easy.max_total_conections = $value
+      #   multi.max_total_conections = $value
       #
       # @param [ String ] value The value to set.
       #
@@ -21,7 +21,7 @@ module Ethon
       # Sets maxconnects option.
       #
       # @example Set maxconnects option.
-      #   easy.maxconnects = $value
+      #   multi.maxconnects = $value
       #
       # @param [ String ] value The value to set.
       #
@@ -33,7 +33,7 @@ module Ethon
       # Sets pipelining option.
       #
       # @example Set pipelining option.
-      #   easy.pipelining = $value
+      #   multi.pipelining = $value
       #
       # @param [ String ] value The value to set.
       #
@@ -45,7 +45,7 @@ module Ethon
       # Sets socketdata option.
       #
       # @example Set socketdata option.
-      #   easy.socketdata = $value
+      #   multi.socketdata = $value
       #
       # @param [ String ] value The value to set.
       #
@@ -57,7 +57,7 @@ module Ethon
       # Sets socketfunction option.
       #
       # @example Set socketfunction option.
-      #   easy.socketfunction = $value
+      #   multi.socketfunction = $value
       #
       # @param [ String ] value The value to set.
       #
@@ -69,7 +69,7 @@ module Ethon
       # Sets timerdata option.
       #
       # @example Set timerdata option.
-      #   easy.timerdata = $value
+      #   multi.timerdata = $value
       #
       # @param [ String ] value The value to set.
       #
@@ -81,7 +81,7 @@ module Ethon
       # Sets timerfunction option.
       #
       # @example Set timerfunction option.
-      #   easy.timerfunction = $value
+      #   multi.timerfunction = $value
       #
       # @param [ String ] value The value to set.
       #

data/lib/ethon/version.rb

@@ -2,5 +2,5 @@
 module Ethon
 
   # Ethon version.
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

data/spec/ethon/libc_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Hans Hasselberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-11 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi