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-Flag: YES X-Spam-Level: ********* X-Spam-ASN: AS200651 185.100.84.0/23 X-Spam-Status: Yes, score=9.8 required=3.0 tests=AWL,BAYES_00, RCVD_IN_BL_SPAMCOP_NET,RCVD_IN_BRBL_LASTEXT,RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L5,RCVD_IN_PSBL,RCVD_IN_RP_RNBL,RCVD_IN_SBL_CSS,RCVD_IN_XBL, RDNS_NONE,SPF_FAIL,SPF_HELO_FAIL shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 X-Spam-Report: * 3.3 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS * [185.100.84.108 listed in zen.spamhaus.org] * 0.4 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL * 1.4 RCVD_IN_BRBL_LASTEXT RBL: No description available. * [185.100.84.108 listed in bb.barracudacentral.org] * 0.0 RCVD_IN_MSPIKE_L5 RBL: Very bad reputation (-5) * [185.100.84.108 listed in bl.mailspike.net] * 2.7 RCVD_IN_PSBL RBL: Received via a relay in PSBL * [185.100.84.108 listed in psbl.surriel.com] * 1.3 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net * [Blocked - see ] * 1.3 RCVD_IN_RP_RNBL RBL: Relay in RNBL, * https://senderscore.org/blacklistlookup/ * [185.100.84.108 listed in bl.score.senderscore.com] * 0.0 SPF_HELO_FAIL SPF: HELO does not match SPF record (fail) * [SPF failed: Please see http://www.openspf.org/Why?s=helo;id=80x24.org;ip=185.100.84.108;r=dcvr.yhbt.net] * 0.0 SPF_FAIL SPF: sender does not match SPF record (fail) * [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=e%4080x24.org;ip=185.100.84.108;r=dcvr.yhbt.net] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 RCVD_IN_MSPIKE_BL Mailspike blacklisted * 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS * 0.4 AWL AWL: Adjusted score from AWL reputation of From: address Received: from 80x24.org (unknown [185.100.84.108]) by dcvr.yhbt.net (Postfix) with ESMTP id 9C6B41FA7B for ; Mon, 16 May 2016 01:43:58 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH 5/7] proxy_pass: trim down proxy_response_finish, too Date: Mon, 16 May 2016 01:43:38 +0000 Message-Id: <20160516014340.8258-6-e@80x24.org> In-Reply-To: <20160516014340.8258-1-e@80x24.org> References: <20160516014340.8258-1-e@80x24.org> List-Id: After the previous commits, we've added more branches and made the existing response handling more generic; so we can remove some duplicated logic and increase review-ability. --- lib/yahns/proxy_http_response.rb | 66 ++-------------------------------------- 1 file changed, 3 insertions(+), 63 deletions(-) diff --git a/lib/yahns/proxy_http_response.rb b/lib/yahns/proxy_http_response.rb index 52a8aff..65fd03b 100644 --- a/lib/yahns/proxy_http_response.rb +++ b/lib/yahns/proxy_http_response.rb @@ -202,69 +202,9 @@ def proxy_response_start(res, tip, kcar, req_res) end def proxy_response_finish(kcar, wbuf, req_res) - rbuf = Thread.current[:yahns_rbuf] - if len = kcar.body_bytes_left # known Content-Length - - case tmp = req_res.kgio_tryread(0x2000, rbuf) - when String - len = kcar.body_bytes_left -= tmp.size - wbuf.wbuf_write(self, tmp) - when nil # premature EOF - return proxy_err_response(nil, req_res, nil, wbuf) - when :wait_readable - return :wait_readable # self remains in :ignore, wait on upstream - end while len != 0 - - elsif kcar.chunked? # nasty chunked response body - buf = ''.dup - - unless req_res.proxy_trailers - # are we done dechunking the main body, yet? - case tmp = req_res.kgio_tryread(0x2000, rbuf) - when String - kcar.filter_body(buf, tmp) - buf.empty? or wbuf.wbuf_write(self, chunk_out(buf)) - when nil # premature EOF - return proxy_err_response(nil, req_res, nil, wbuf) - when :wait_readable - return :wait_readable # self remains in :ignore, wait on upstream - end until kcar.body_eof? - req_res.proxy_trailers = [ tmp, [] ] # onto trailers! - rbuf = Thread.current[:yahns_rbuf] = ''.dup - end - - buf, tlr = *req_res.proxy_trailers - until kcar.trailers(tlr, buf) - case rv = req_res.kgio_tryread(0x2000, rbuf) - when String - buf << rv - when :wait_readable - return :wait_readable - when nil # premature EOF - return proxy_err_response(nil, req_res, nil, wbuf) - end # no loop here - end - wbuf.wbuf_write(self, trailer_out(tlr)) - - 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 - wbuf.wbuf_write(self, tmp) - when nil - wbuf.wbuf_write(self, "0\r\n\r\n".freeze) if alive - req_res.shutdown - break - when :wait_readable - return :wait_readable # self remains in :ignore, wait on upstream - end while true - - end - - busy = wbuf.busy and return proxy_busy_mod_blocked(wbuf, busy) - proxy_busy_mod_done(wbuf.wbuf_persist) # returns nil to close req_res + alive = wbuf.wbuf_persist + req_res.proxy_trailers ? proxy_read_trailers(kcar, req_res, alive, wbuf) + : proxy_read_body([], kcar, req_res, alive, wbuf) end def proxy_wait_next(qflags)