lib/httpi/adapter/httpclient.rb in httpi-2.1.1 vs lib/httpi/adapter/httpclient.rb in httpi-2.2.0

@@ -39,11 +39,11 @@
         if @request.auth.ntlm?
           raise NotSupportedError, "HTTPClient adapter does not support NTLM authentication"
         end
 
         setup_auth if @request.auth.http?
-        setup_ssl_auth if @request.auth.ssl?
+        setup_ssl_auth if @request.auth.ssl? || @request.ssl?
       end
 
       def basic_setup
         @client.proxy = @request.proxy if @request.proxy
         @client.connect_timeout = @request.open_timeout if @request.open_timeout
@@ -55,18 +55,21 @@
       end
 
       def setup_ssl_auth
         ssl = @request.auth.ssl
 
-        if ssl.ca_cert_file && ssl.verify_mode != :none
-          @client.ssl_config.add_trust_ca(ssl.ca_cert_file)
-        end
+        if @request.auth.ssl?
+          if ssl.ca_cert_file && ssl.verify_mode != :none
+            @client.ssl_config.add_trust_ca(ssl.ca_cert_file)
+          end
 
-        # Send client-side certificate regardless of state of SSL verify mode
-        @client.ssl_config.client_cert = ssl.cert
-        @client.ssl_config.client_key = ssl.cert_key
+          # Send client-side certificate regardless of state of SSL verify mode
+          @client.ssl_config.client_cert = ssl.cert
+          @client.ssl_config.client_key = ssl.cert_key
 
-        @client.ssl_config.verify_mode = ssl.openssl_verify_mode
+          @client.ssl_config.verify_mode = ssl.openssl_verify_mode
+        end
+
         @client.ssl_config.ssl_version = ssl.ssl_version.to_s if ssl.ssl_version
       end
 
       def respond_with(response)
         headers = {}