ethon 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -2,9 +2,20 @@
 
 ## Master
 
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.1...master)
+
+Enhancements:
+
+* New libcurl option keypasswd.
+
+Bugfixes:
+
+* Correct request logging when using multi interface.
+* Remove invalid libcurl option sslcertpasswd.
+
 ## 0.5.1
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.0...0.5.1)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.5.0...v0.5.1)
 
 Bugfixes:
 
@@ -13,7 +24,7 @@ Bugfixes:
 
 ## 0.5.0
 
-[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.4...0.5.0)
+[Full Changelog](http://github.com/typhoeus/ethon/compare/v0.4.4...v0.5.0)
 
 Enhancements:
 

data/lib/ethon/curls/options.rb

@@ -40,7 +40,6 @@ module Ethon
       # https://github.com/bagder/curl/blob/master/include/curl/curl.h
       def easy_options
         {
-
           :file                        =>  option_types[:object_point]    +  1,
           :writedata                   =>  option_types[:object_point]    +  1,
           :url                         =>  option_types[:object_point]    +  2,
@@ -66,8 +65,7 @@ module Ethon
           :httpheader                  =>  option_types[:object_point]    +  23,
           :httppost                    =>  option_types[:object_point]    +  24,
           :sslcert                     =>  option_types[:object_point]    +  25,
-          :sslcertpasswd               =>  option_types[:object_point]    +  26,
-          :sslkeypasswd                =>  option_types[:object_point]    +  26,
+          :keypasswd                   =>  option_types[:object_point]    +  26,
           :crlf                        =>  option_types[:long]            +  27,
           :quote                       =>  option_types[:object_point]    +  28,
           :writeheader                 =>  option_types[:object_point]    +  29,

data/lib/ethon/easy.rb

@@ -384,6 +384,13 @@ module Ethon
     #  to avoid allowing the code to block. If "if!" is specified but the
     #  parameter does not match an existing interface,
     #  CURLE_INTERFACE_FAILED is returned.
+    # @option options :keypasswd [String]
+    #  Pass a pointer to a zero terminated string as parameter. It will be
+    #  used as the password required to use the CURLOPT_SSLKEY or
+    #  CURLOPT_SSH_PRIVATE_KEYFILE private key. You never needed a pass
+    #  phrase to load a certificate but you need one to load your private key.
+    #  (This option was known as CURLOPT_SSLKEYPASSWD up to 7.16.4 and
+    #  CURLOPT_SSLCERTPASSWD up to 7.9.2)
     # @option options :maxredirs [Integer]
     #  Pass a long. The set number will be the redirection limit. If that
     #  many redirections have been followed, the next redirect will cause an

data/lib/ethon/easy/options.rb

@@ -14,7 +14,7 @@ module Ethon
           :dns_cache_timeout, :httppost, :httpget, :nobody, :upload,
           :customrequest, :cainfo, :capath, :connecttimeout, :connecttimeout_ms,
           :forbid_reuse, :followlocation, :httpauth, :infilesize, :interface,
-          :maxredirs, :nosignal, :postfieldsize, :copypostfields, :proxy,
+          :keypasswd, :maxredirs, :nosignal, :postfieldsize, :copypostfields, :proxy,
           :proxyauth, :proxyport, :proxytype, :proxyuserpwd, :timeout, :timeout_ms,
           :readdata, :sslcert, :ssl_verifypeer, :ssl_verifyhost, :sslcerttype,
           :sslkey, :sslkeytype, :sslversion, :url, :useragent, :userpwd,

data/lib/ethon/multi/operations.rb

@@ -138,9 +138,9 @@ module Ethon
           next if msg[:code] != :done
           easy = easy_handles.find{ |e| e.handle == msg[:easy_handle] }
           easy.return_code = msg[:data][:code]
+          Ethon.logger.debug("ETHON:         performed #{easy.log_inspect}")
           delete(easy)
           easy.complete
-          Ethon.logger.debug("ETHON:         performed #{easy.log_inspect}")
         end
       end
 

data/lib/ethon/version.rb

@@ -3,5 +3,5 @@ module Ethon
   # Ethon version.
   #
   # @api public
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ethon
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2761547586556677808
+      hash: -2796817779069789218
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: