diff options
author | Eric Wong <ew@80x24.org> | 2017-12-16 01:22:40 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2017-12-16 01:33:46 +0000 |
commit | 30e3c6abe542c6a9f5955e1d65896a0c3bab534f (patch) | |
tree | 5cecdf58f29e130c423e7bf7b671800f56143eec /lib/unicorn/http_response.rb | |
parent | 1a407d78c90695c03ec6ac1e0a8b7f0e466c975e (diff) | |
download | unicorn-30e3c6abe542c6a9f5955e1d65896a0c3bab534f.tar.gz |
Hijackers may capture and reuse `env' indefinitely, so we must not use it in those cases for future requests. For non-hijack requests, we continue to reuse the `env' object to reduce memory recycling. Reported-and-tested-by: Sam Saffron <sam.saffron@gmail.com>
Diffstat (limited to 'lib/unicorn/http_response.rb')
-rw-r--r-- | lib/unicorn/http_response.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/unicorn/http_response.rb b/lib/unicorn/http_response.rb index ec128e4..b23e521 100644 --- a/lib/unicorn/http_response.rb +++ b/lib/unicorn/http_response.rb @@ -21,13 +21,13 @@ module Unicorn::HttpResponse # writes the rack_response to socket as an HTTP response def http_response_write(socket, status, headers, body, - response_start_sent=false) + req = Unicorn::HttpRequest.new) hijack = nil if headers code = status.to_i msg = STATUS_CODES[code] - start = response_start_sent ? ''.freeze : 'HTTP/1.1 '.freeze + start = req.response_start_sent ? ''.freeze : 'HTTP/1.1 '.freeze buf = "#{start}#{msg ? %Q(#{code} #{msg}) : status}\r\n" \ "Date: #{httpdate}\r\n" \ "Connection: close\r\n" @@ -52,6 +52,7 @@ module Unicorn::HttpResponse end if hijack + req.hijacked! hijack.call(socket) else body.each { |chunk| socket.write(chunk) } |