excon 0.39.1 → 0.39.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzE5ZjBjOGEyNjU5ZjliMWZmOGEyMjRkY2Y2ZmQ4MDk4NzNjZGI1NA==
+    MTU3YmU2ZWIyNTMzYjdhNTUwN2IxZGIxY2E0YmM3MTA5MTYwZWFmYQ==
   data.tar.gz: !binary |-
-    MmQ3MGQzNTNkYzYxMDNmNDk5MGZiNmY2OWFhMDQ3NzI2NjY2MjE1Mw==
+    YWUwMTI4NTI1Mzk1NTA5MjExZTMyNWM3ZTg3ZTg2ZjEwMTUwZTcyYg==
 SHA512:
   metadata.gz: !binary |-
-    OTRhZmJlNjg0OTg3ZjY3MmE1MzJiMmYyN2QyZTBiYjY5NzgxMzA4YWY0MzAy
-    YWU0NWJkNGE5NGI0NTY0MzQzMDQyNGUyNzYzZGYwMzQwNjNiMmFmY2Y4OTVj
-    MDQ3ZjBiZmZhOTIxZTA5NTFiMDU0ZTFkYzdjNTlhZDVjOWE0MjU=
+    N2QzY2I5NmI3OWU2NTU3MmQyOTg3OTQ1NWUyYTk3ZWJhNDUzMDExYTU3ZWQ2
+    ZDVhZGUzNmE3OTY5MGE2MTM4Yjc0MGJkMGM0MGYxZDkzZWFlZjk5ZDU4YTgy
+    MjI5M2Y5YTM1MzdiNDkxZjMxNWVkZGFkYTE1OWMwNDE0N2E1ZjQ=
   data.tar.gz: !binary |-
-    MTQ0ZWI4ODcxMWU1YjIwNjdjNTEzZGU0ZjRmYWQ2OTEzYWNjN2MzMWJkM2Mw
-    MTllZDdlNDhhOTU1YWUyMzFmZmU1NDRiZWQ5NWQ1NDQ5NzNkODljZDc5OGFj
-    ZGU4MjA3MWY2NWI0NmZhYzMzMzc5OTFkNTA1NjI3OWZiMmVhMzc=
+    NDE3MzJkNDFkNjc5ZTc2Y2YzOThjMWZjODczM2M3MWQ5NGM2MjY0ZTgwMmEw
+    YWUzZGZhYzk0YTFlYjQyZmQ3NjlkNzIwYjE3MmE5MGRmMTIxMzk5YjI2OTRm
+    NWFlM2E5MjgxNTQyZTg5MGMzOTEyYWVjZjI0MzY2ZDg3OTQ1MDc=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.39.1)
+    excon (0.39.2)
 
 GEM
   remote: http://rubygems.org/

data/changelog.txt

@@ -1,3 +1,8 @@
+0.39.2 08/04/2014
+=================
+
+respect both ca_file/ca_path when both present
+
 0.39.1 08/04/2014
 =================
 

data/excon.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.39.1'
+  s.version           = '0.39.2'
   s.date              = '2014-08-04'
   s.rubyforge_project = 'excon'
 

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.39.1'
+  VERSION = '0.39.2'
 
   CR_NL = "\r\n"
 

data/lib/excon/ssl_socket.rb

@@ -29,11 +29,15 @@ module Excon
         # turn verification on
         ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
+        if ca_file = ENV['SSL_CERT_FILE'] || @data[:ssl_ca_file]
+          ssl_context.ca_file = ca_file
+        end
         if ca_path = ENV['SSL_CERT_DIR'] || @data[:ssl_ca_path]
           ssl_context.ca_path = ca_path
-        elsif ca_file = ENV['SSL_CERT_FILE'] || @data[:ssl_ca_file]
-          ssl_context.ca_file = ca_file
-        else # attempt default, fallback to bundled
+        end
+
+        # no defaults, fallback to bundled
+        unless ca_file || ca_path
           ssl_context.cert_store = OpenSSL::X509::Store.new
           ssl_context.cert_store.set_default_paths
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.39.2
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)