summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerence Lee <hone02@gmail.com>2013-11-06 12:33:24 -0800
committerTerence Lee <hone02@gmail.com>2013-11-06 12:33:24 -0800
commit8df479748ef66b2816b5c148458bfa87078e2bcd (patch)
tree408fb47ea9c2376802181aeb2106bdf5baffd933
parentafd99dcd7b28e0e804bc5d3321f04241c1e4a926 (diff)
parentec0621d81602ce7f7e24ce7e9194ba2022c2c44c (diff)
downloadbundler-8df479748ef66b2816b5c148458bfa87078e2bcd.tar.gz
Merge pull request #2698 from bundler/ssl_safe_fork
close persistent connections before forking
-rw-r--r--lib/bundler/parallel_workers/unix_worker.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/bundler/parallel_workers/unix_worker.rb b/lib/bundler/parallel_workers/unix_worker.rb
index ce7b7fe9ed..51c2d0d89c 100644
--- a/lib/bundler/parallel_workers/unix_worker.rb
+++ b/lib/bundler/parallel_workers/unix_worker.rb
@@ -14,6 +14,12 @@ module Bundler
end
end
+ def initialize(size, job)
+ # Close the persistent connections for the main thread before forking
+ Net::HTTP::Persistent.new('bundler', :ENV).shutdown
+ super
+ end
+
private
# Start forked workers for downloading gems. This version of worker