diff options
| author | Andre Arko <andre@arko.net> | 2014-02-18 09:18:07 +1100 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2014-02-18 09:18:07 +1100 |
| commit | 6fdce877a78c489e96dcf161cece19dde3da0c05 (patch) | |
| tree | 330ae2c9d7a52560a35080b55d149211c116c2d0 /lib | |
| parent | 9142f0895b9eae5a9b2501be54fc4eaca2be9e9d (diff) | |
| parent | 2854ae6f9108be6153345306b02b169a69a2ffe4 (diff) | |
| download | bundler-6fdce877a78c489e96dcf161cece19dde3da0c05.tar.gz | |
Merge pull request #2878 from stlay/fix_no_proxy_request
Pass nil to net_http as proxy parameter not to use environment variables
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/vendor/net/http/persistent.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/vendor/net/http/persistent.rb b/lib/bundler/vendor/net/http/persistent.rb index b883e64db8..60a084e14f 100644 --- a/lib/bundler/vendor/net/http/persistent.rb +++ b/lib/bundler/vendor/net/http/persistent.rb @@ -616,6 +616,8 @@ class Net::HTTP::Persistent if @proxy_uri and not proxy_bypass? uri.host, uri.port then connection_id << @proxy_connection_id net_http_args.concat @proxy_args + elsif proxy_bypass? uri.host, uri.port then + net_http_args.concat [nil, nil] end connection = connections[connection_id] |