Skip to content
Snippets Groups Projects
Unverified Commit de45c395 authored by Mayra Cabrera's avatar Mayra Cabrera Committed by GitLab
Browse files

Merge branch 'sh-backport-capybara-proxy-fix-16-3' into '16-3-stable-ee'

Prevent starting multiple Capybara proxy servers

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/156433



Merged-by: default avatarMayra Cabrera <mcabrera@gitlab.com>
Approved-by: default avatarMayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: default avatarHeinrich Lee Yu <heinrich@gitlab.com>
parents 496a8e94 d5ad4e87
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -94,11 +94,13 @@
options.add_preference("download.prompt_for_download", false)
end
 
# Set up a proxy server to block all external traffic.
@blackhole_tcp_server = TCPServer.new(0)
Thread.new do
loop do
Thread.start(@blackhole_tcp_server.accept, &:close)
if @blackhole_tcp_server.nil?
# Set up a proxy server to block all external traffic.
@blackhole_tcp_server = TCPServer.new(0)
Thread.new do
loop do
Thread.start(@blackhole_tcp_server.accept, &:close)
end
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment