diff options
| author | Hirotaka Azuma <azuma@scaleout.jp> | 2015-07-16 08:11:31 +0000 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2015-08-14 19:58:17 -0700 |
| commit | f2bd2594f68e59090d95b835f00212e06092209a (patch) | |
| tree | 7fa7abe6ab4369fa3b8e8ce46b861c780755b889 | |
| parent | e3c73f74eaa2b759dcec3fb1bf0368a5b8a2d6d3 (diff) | |
| download | bundler-f2bd2594f68e59090d95b835f00212e06092209a.tar.gz | |
considerate .gemrc when determine http_proxy
| -rw-r--r-- | lib/bundler/fetcher.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index 6236bee7b6..efa1a1f210 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -203,6 +203,9 @@ module Bundler raise SSLError if needs_ssl && !defined?(OpenSSL::SSL) con = Net::HTTP::Persistent.new "bundler", :ENV + if gem_proxy = Gem.configuration[:http_proxy] + con.proxy = URI.parse(gem_proxy) + end if remote_uri.scheme == "https" con.verify_mode = (Bundler.settings[:ssl_verify_mode] || |