From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] proxy_pass: do not chunk HTTP/1.0 with keep-alive
Date: Mon, 16 May 2016 01:12:45 +0000 [thread overview]
Message-ID: <20160516011245.30972-1-e@80x24.org> (raw)
Instead, we must drop non-terminated responses since
HTTP/1.0 clients do not understand chunked encoding.
This is necessary for "ab -k" which still uses HTTP/1.0.
---
lib/yahns/proxy_http_response.rb | 8 ++++++--
test/test_proxy_pass.rb | 10 ++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb
index c5e7be5..bd274fe 100644
--- a/lib/yahns/proxy_http_response.rb
+++ b/lib/yahns/proxy_http_response.rb
@@ -105,8 +105,12 @@ def proxy_response_start(res, tip, kcar, req_res)
# chunk the response ourselves if the client supports it,
# but the backend does not terminate properly
- if alive && ! term && (env['HTTP_VERSION'] == 'HTTP/1.1'.freeze)
- res << "Transfer-Encoding: chunked\r\n".freeze
+ if alive && ! term
+ 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
+ alive = false
+ end
end
res << (alive ? "Connection: keep-alive\r\n\r\n".freeze
: "Connection: close\r\n\r\n".freeze)
diff --git a/test/test_proxy_pass.rb b/test/test_proxy_pass.rb
index c938976..5dd8058 100644
--- a/test/test_proxy_pass.rb
+++ b/test/test_proxy_pass.rb
@@ -572,6 +572,16 @@ def check_response_trailer(host, port)
end
def check_eof_body(host, port)
+ Timeout.timeout(30) do
+ s = TCPSocket.new(host, port)
+ s.write("GET /eof-body-fast HTTP/1.0\r\nConnection:keep-alive\r\n\r\n")
+ res = s.read
+ assert_match %r{\AHTTP/1\.[01] 200 OK\r\n}, res
+ assert_match %r{\r\nConnection: close\r\n}, res
+ assert_match %r{\r\n\r\neof-body-fast\z}, res
+ s.close
+ end
+
Timeout.timeout(60) do
s = TCPSocket.new(host, port)
s.write("GET /eof-body-fast HTTP/1.0\r\n\r\n")
reply other threads:[~2016-05-16 1:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/yahns/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160516011245.30972-1-e@80x24.org \
--to=e@80x24.org \
--cc=yahns-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/yahns.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).