Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CF819200C3A for ; Thu, 16 Mar 2017 18:19:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id CE51F160B8B; Thu, 16 Mar 2017 17:19:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 28DFC160B72 for ; Thu, 16 Mar 2017 18:19:28 +0100 (CET) Received: (qmail 12778 invoked by uid 500); 16 Mar 2017 17:19:27 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 12768 invoked by uid 99); 16 Mar 2017 17:19:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2017 17:19:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 45CA6DFBC9; Thu, 16 Mar 2017 17:19:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bbastian@apache.org To: commits@couchdb.apache.org Date: Thu, 16 Mar 2017 17:19:27 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] couch-mrview commit: updated refs/heads/master to f897fdc archived-at: Thu, 16 Mar 2017 17:19:29 -0000 Repository: couchdb-couch-mrview Updated Branches: refs/heads/master 49533ef9d -> f897fdc2c Fix undef error on empty list function response Prior to this commit, if a list function did not return any data or returned an error, it would return a #lacc{} record from list_cb/2 rather than a valid #mochiweb_response{} record. This would cause chttpd to crash. This commit fixes this bug by always returning a valid record. Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/56616fad Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/56616fad Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/56616fad Branch: refs/heads/master Commit: 56616fad9b0621b6606e4b521a2ec4b8342877aa Parents: e1d13a9 Author: Benjamin Bastian Authored: Thu Mar 9 18:20:25 2017 -0800 Committer: Benjamin Bastian Committed: Thu Mar 9 18:20:25 2017 -0800 ---------------------------------------------------------------------- src/couch_mrview_show.erl | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/56616fad/src/couch_mrview_show.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_show.erl b/src/couch_mrview_show.erl index 52e07a7..f79ad62 100644 --- a/src/couch_mrview_show.erl +++ b/src/couch_mrview_show.erl @@ -284,26 +284,24 @@ send_list_row(Row, #lacc{qserver = {Proc, _}, req = Req, resp = Resp} = Acc) -> Acc2 = send_non_empty_chunk(Acc, Chunk), {ok, Acc2}; [<<"end">>, Chunk, Headers] -> - Acc2 = send_non_empty_chunk(fixup_headers(Headers, Acc), Chunk), - #lacc{resp = Resp2} = Acc2, - last_chunk(Req, Resp2), - {stop, Acc2}; + #lacc{resp = Resp2} = send_non_empty_chunk(fixup_headers(Headers, Acc), Chunk), + {ok, Resp3} = last_chunk(Req, Resp2), + {stop, Resp3}; [<<"end">>, Chunk] -> - Acc2 = send_non_empty_chunk(Acc, Chunk), - #lacc{resp = Resp2} = Acc2, - last_chunk(Req, Resp2), - {stop, Acc2} + #lacc{resp = Resp2} = send_non_empty_chunk(Acc, Chunk), + {ok, Resp3} = last_chunk(Req, Resp2), + {stop, Resp3} catch Error -> - case Resp of + {ok, Resp2} = case Resp of undefined -> {Code, _, _} = chttpd:error_info(Error), #lacc{req=Req, headers=Headers} = Acc, - {ok, Resp2} = chttpd:start_chunked_response(Req, Code, Headers), - Acc2 = Acc#lacc{resp=Resp2, code=Code}; - _ -> Resp2 = Resp, Acc2 = Acc + chttpd:start_chunked_response(Req, Code, Headers); + _ -> + {ok, Resp} end, - chttpd:send_chunked_error(Resp2, Error), - {stop, Acc2} + {ok, Resp3} = chttpd:send_chunked_error(Resp2, Error), + {stop, Resp3} end. send_non_empty_chunk(Acc, []) ->