From 91e4f202d4db4ebcb9a4eb863d4598f3c0f73858 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 9 Jun 2015 22:15:25 +0000 Subject: ensure body is closed during hijack Middlewares such as Rack::Lock (used by Rails) break badly unless the response body is closed on hijack, so we will close it to follow the lead of other popular Rack servers. While it's unclear if there's anybody using rack.hijack besides yahns/proxy_pass we'll try to emulate the behavior of other servers as much as possible. ref: https://github.com/ngauthier/tubesock/issues/10 While we're at it, use DieIfUsed correctly in test_ssl.rb :x --- test/test_ssl.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test/test_ssl.rb') diff --git a/test/test_ssl.rb b/test/test_ssl.rb index 8f01ef7..c54cc3c 100644 --- a/test/test_ssl.rb +++ b/test/test_ssl.rb @@ -124,10 +124,11 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC p [ :ERR, req ] end until s.closed? end - [ 200, DieIfUsed, DieIfUsed ] + [ 200, DieIfUsed.new, DieIfUsed.new ] end app(:rack, ru) { listen "#{host}:#{port}", ssl_ctx: ctx } logger(Logger.new(err.path)) + stderr_path err.path end end client = ssl_client(host, port) @@ -147,6 +148,8 @@ AQjjxMXhwULlmuR/K+WwlaZPiLIBYalLAZQ7ZbOPeVkJ8ePao0eLAgEC %w(a b c d).each { |x| client.puts(x) } assert_equal "abcd", client.gets.strip end + errs = File.readlines(err.path).grep(/DieIfUsed/) + assert_equal([ "INFO #{pid} closed DieIfUsed 1\n" ], errs) ensure client.close if client quit_wait(pid) -- cgit v1.2.3-24-ge0c7