Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[excon] pass client side cert information to excon #288

Merged
merged 1 commit into from

3 participants

@ehowe

No description provided.

@lanej

relates to excon/excon#236

@technoweenie technoweenie merged commit eb34dc3 into lostisland:master

1 check passed

Details default The Travis CI build passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 17, 2013
  1. @ehowe
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 1 deletion.
  1. +4 −0 lib/faraday/adapter/excon.rb
  2. +1 −1  lib/faraday/options.rb
View
4 lib/faraday/adapter/excon.rb
@@ -16,6 +16,10 @@ def call(env)
opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true)
opts[:ssl_ca_path] = ssl[:ca_path] if ssl[:ca_path]
opts[:ssl_ca_file] = ssl[:ca_file] if ssl[:ca_file]
+ opts[:client_cert] = ssl[:client_cert] if ssl[:client_cert]
+ opts[:client_key] = ssl[:client_key] if ssl[:client_key]
+ opts[:certificate] = ssl[:certificate] if ssl[:certificate]
+ opts[:private_key] = ssl[:private_key] if ssl[:private_key]
# https://github.com/geemus/excon/issues/106
# https://github.com/jruby/jruby-ossl/issues/19
View
2  lib/faraday/options.rb
@@ -114,7 +114,7 @@ def []=(key, value)
end
class SSLOptions < Options.new(:verify, :ca_file, :ca_path, :verify_mode,
- :cert_store, :client_cert, :client_key, :verify_depth, :version)
+ :cert_store, :client_cert, :client_key, :certificate, :private_key, :verify_depth, :version)
def verify?
verify != false
Something went wrong with that request. Please try again.