From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C4782209B4 for ; Wed, 14 Dec 2016 06:59:55 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH 2/2] proxy_pass: do not chunk on bodyless upstream responses Date: Wed, 14 Dec 2016 06:59:52 +0000 Message-Id: <20161214065952.28950-3-e@80x24.org> In-Reply-To: <20161214065952.28950-1-e@80x24.org> References: <20161214065952.28950-1-e@80x24.org> List-Id: As with the previous commit ("response: do not set chunked header on bodyless responses"), blindly setting "Transfer-Encoding: chunked" is wrong and confuses "curl -T" on 204 responses, at least. --- lib/yahns/proxy_http_response.rb | 2 +- test/test_proxy_pass.rb | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb index 74f5ce5..1776291 100644 --- a/lib/yahns/proxy_http_response.rb +++ b/lib/yahns/proxy_http_response.rb @@ -120,7 +120,7 @@ def proxy_res_headers(res, req_res) # chunk the response ourselves if the client supports it, # but the backend does not terminate properly - if alive && ! term + if alive && ! term && have_body if env['HTTP_VERSION'] == 'HTTP/1.1'.freeze res << "Transfer-Encoding: chunked\r\n".freeze else # we can't persist HTTP/1.0 and HTTP/0.9 w/o Content-Length diff --git a/test/test_proxy_pass.rb b/test/test_proxy_pass.rb index 4c4b53a..22f1802 100644 --- a/test/test_proxy_pass.rb +++ b/test/test_proxy_pass.rb @@ -154,6 +154,9 @@ def chunky.each env['rack.hijack'].call.close # should not be seen: [ 123, [ %w(Content-Type text/html), %w(Content-Length 0) ], [] ] + when '/204' + buf = env['rack.input'].read # drain + [ 204, {}, [] ] else buf = env['rack.input'].read [ 201, { @@ -271,6 +274,7 @@ def test_proxy_pass end end + check_204_on_put(host, port) check_forbidden_put(host, port) check_eof_body(host, port) check_pipelining(host, port) @@ -639,4 +643,33 @@ def check_forbidden_put(host, port) ensure to_close.each(&:close) end + + def check_204_on_put(host, port) + s = TCPSocket.new(host, port) + s.write("PUT /204 HTTP/1.1\r\nHost: example.com\r\n" \ + "Content-Length: 11\r\n" \ + "Content-Type: application/octet-stream\r\n" \ + "\r\nhello worldPUT") + buf = s.readpartial(1024) + assert_match %r{\AHTTP/1\.1 204}, buf + assert_match %r{\r\n\r\n\z}, buf + refute_match %r{^Transfer-Encoding}i, buf + refute_match %r{^Content-Length}i, buf + assert_match %r{^Connection: keep-alive\r\n}, buf + assert_nil IO.select([s], nil, nil, 1), 'connection persists..' + + # make sure another on the same connection works + s.write(" / HTTP/1.1\r\nHost: example.com\r\n" \ + "Content-Length: 11\r\n" \ + "Content-Type: application/octet-stream\r\n" \ + "\r\nhello world") + buf = s.readpartial(1024) + assert_match %r{\r\n\r\nhello world\z}, buf + assert_match %r{\AHTTP/1\.1 201}, buf + assert_match(%r{^Content-Length: 11\r\n}, buf) + assert_match %r{^Connection: keep-alive\r\n}, buf + assert_nil IO.select([s], nil, nil, 1), 'connection persists..' + ensure + s.close if s + end end -- EW