diff options
| author | Bundlerbot <bot@bundler.io> | 2020-01-05 01:17:33 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2020-01-05 01:17:33 +0000 |
| commit | 4bf7ea614c9c3f0d4c39f22b80ea0622cd3598c7 (patch) | |
| tree | a64123f16c0b0155ed6545c8dabbc8fc08fa90da /lib | |
| parent | c0b90706c8c417c374ea0f9283def0117d0c7549 (diff) | |
| parent | 92bdbeddfc6bcd11b9d7e9c6ebc2568875c7a4ce (diff) | |
| download | bundler-4bf7ea614c9c3f0d4c39f22b80ea0622cd3598c7.tar.gz | |
Merge #7529
7529: Remove optional require net-http-pipeline from vendored net-http-persistent. r=deivid-rodriguez a=marciotoshio
### What was the end-user problem that led to this PR?
See issue https://github.com/bundler/bundler/issues/7521.
### What was your diagnosis of the problem?
My diagnosis was If you have net-http-pipeline gem installed bundler loads it and you can't vendor it.
### What is your fix for the problem, implemented in this PR?
My fix is remove the optional require of net-http-pipeline.
### Why did you choose this fix out of the possible options?
I chose this fix because was a recommendation in the issue by @deivid-rodriguez
Fixes #7521.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
Co-authored-by: Marcio Toshio <marcio@tosh.io>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb index e9c4c3e89e..f9d1401062 100644 --- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb +++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb @@ -3,11 +3,6 @@ require_relative '../../../../uri/lib/uri' require 'cgi' # for escaping require_relative '../../../../connection_pool/lib/connection_pool' -begin - require 'net/http/pipeline' -rescue LoadError -end - autoload :OpenSSL, 'openssl' ## @@ -774,23 +769,6 @@ class Bundler::Persistent::Net::HTTP::Persistent end ## - # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a - # block is given. Returns all responses received. - # - # See - # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html] - # for further details. - # - # Only if <tt>net-http-pipeline</tt> was required before - # <tt>net-http-persistent</tt> #pipeline will be present. - - def pipeline uri, requests, &block # :yields: responses - connection_for uri do |connection| - connection.http.pipeline requests, &block - end - end - - ## # Sets this client's SSL private key def private_key= key |