From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] proxy_pass: honor wbuf_persist when ending response
Date: Fri, 22 Apr 2016 00:13:12 +0000 [thread overview]
Message-ID: <20160422001312.GA3410@dcvr.yhbt.net> (raw)
In-Reply-To: <20160416081712.GA21868@dcvr.yhbt.net>
If a static file response gets truncated while writing, we
set wbuf_persist to false in wbuf_flush of lib/yahns/wbuf_common.rb
Thus, we must check wbuf_persist attribute as late as possible
before yielding control back to the caller in proxy_response_finish
---
A hopefully better version of what I proposed in:
https://yhbt.net/yahns-public/20160416081712.GA21868@dcvr.yhbt.net/
lib/yahns/proxy_http_response.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb
index d0e3e41..c8a2a42 100644
--- a/lib/yahns/proxy_http_response.rb
+++ b/lib/yahns/proxy_http_response.rb
@@ -187,7 +187,6 @@ def proxy_response_start(res, tip, kcar, req_res)
def proxy_response_finish(kcar, wbuf, req_res)
rbuf = Thread.current[:yahns_rbuf]
- alive = wbuf.wbuf_persist
if len = kcar.body_bytes_left # known Content-Length
case tmp = req_res.kgio_tryread(0x2000, rbuf)
@@ -233,6 +232,7 @@ def proxy_response_finish(kcar, wbuf, req_res)
else # no Content-Length or Transfer-Encoding: chunked, wait on EOF!
+ alive = wbuf.wbuf_persist
case tmp = req_res.kgio_tryread(0x2000, rbuf)
when String
tmp = chunk_out(tmp) if alive
@@ -248,7 +248,7 @@ def proxy_response_finish(kcar, wbuf, req_res)
end
busy = wbuf.busy and return proxy_busy_mod_blocked(wbuf, busy)
- proxy_busy_mod_done(alive) # returns nil
+ proxy_busy_mod_done(wbuf.wbuf_persist) # returns nil
end
def proxy_wait_next(qflags)
--
EW
prev parent reply other threads:[~2016-04-22 0:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 6:25 [PATCH] proxy_http_response: workaround non-terminated backends Eric Wong
2016-04-16 8:17 ` Eric Wong
2016-04-22 0:13 ` Eric Wong [this message]
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=20160422001312.GA3410@dcvr.yhbt.net \
--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).