httpclient 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ffce5e3ce378196b7441498f0a93969da6086f
-  data.tar.gz: 91ba9e1062f6515828ae1983ca28eb0a2d40a75d
+  metadata.gz: ec7e272df4e6600193bdd3a5fb96d7079884e9b1
+  data.tar.gz: 7582ada524a7bf3f92745af4f944187f302f22f9
 SHA512:
-  metadata.gz: 743acf9501f271b66d4b7dcc25812ea766f81d4e3eae6f5a4784ce157a3db7f81a386c6d8a7cced0b87cb464040752997047dad0d627cc94fb9451371f34a44b
-  data.tar.gz: 1e14c7fdd6ec23d895310ca70f3a96a6bd44910371f6221c33095fa4302344da15574a109e800493481e8477dbbb33ce4c4d2cb0661e271c0846d3b8674cf8ba
+  metadata.gz: 42e6d5bdb00c17c46eedb6d73277d6e2197ac61a010c50efbb48cee2c5a502127c65863cee60b5450a17a063434cbde70de926d435cd978c2b5c542acec17fe7
+  data.tar.gz: 6e2cc8eda6e3ad3d53d2c7a2ccb554a1a82de12b88404d9d61e51e9a1f1f2057868100e98302cbfd589c732a96b13c33a03563064ba3dff7b4ba4b76114d73dd

data/lib/httpclient/jruby_ssl_socket.rb

@@ -316,6 +316,7 @@ unless defined?(SSLSocket)
         return if cert_source == :default
         if cert_source.respond_to?(:to_pem)
           pem = cert_source.to_pem
+          load_pem(pem)
         elsif File.directory?(cert_source)
           warn("#{cert_source}: directory not yet supported")
           return
@@ -326,7 +327,8 @@ unless defined?(SSLSocket)
             when /-----BEGIN CERTIFICATE-----/
               pem = ''
             when /-----END CERTIFICATE-----/
-              break
+              load_pem(pem)
+              # keep parsing in case where multiple certificates in a file
             else
               if pem
                 pem << line
@@ -334,9 +336,6 @@ unless defined?(SSLSocket)
             end
           end
         end
-        cert = PEMUtils.read_certificate(pem)
-        @size += 1
-        @trust_store.setCertificateEntry("cert_#{@size}", cert)
       end
 
       def trust_store
@@ -346,6 +345,14 @@ unless defined?(SSLSocket)
           @trust_store
         end
       end
+
+    private
+
+      def load_pem(pem)
+        cert = PEMUtils.read_certificate(pem)
+        @size += 1
+        @trust_store.setCertificateEntry("cert_#{@size}", cert)
+      end
     end
 
     # Ported from commons-httpclient 'BrowserCompatHostnameVerifier'

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.8.1'
+  VERSION = '2.8.2'
 end

data/test/test_ssl.rb

@@ -217,18 +217,14 @@ else
   end
 end
 
-  # SSL_CERT_FILE does not work with recent jruby-openssl.
-  # You should not depend on SSL_CERT_FILE on JRuby
-  if !defined?(JRUBY_VERSION)
-    def test_set_default_paths
-      assert_raise(OpenSSL::SSL::SSLError) do
-        @client.get(@url)
-      end
-      escape_env do
-        ENV['SSL_CERT_FILE'] = File.join(DIR, 'ca-chain.pem')
-        @client.ssl_config.set_default_paths
-        @client.get(@url)
-      end
+  def test_set_default_paths
+    assert_raise(OpenSSL::SSL::SSLError) do
+      @client.get(@url)
+    end
+    escape_env do
+      ENV['SSL_CERT_FILE'] = File.join(DIR, 'ca-chain.pem')
+      @client.ssl_config.set_default_paths
+      @client.get(@url)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Hiroshi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org