couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/2] chttpd commit: updated refs/heads/master to 43e1d0d
Date Mon, 13 Jun 2016 15:07:03 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master 5a96fa895 -> 43e1d0d81


Don't expect #vacc as a response in multi_query_view

When multi_query_view is calling chttpd:end_delayed_json_response/1 it is
passing in the response object it received from query_view's #vacc,
which means it'll get back resp record and not #vacc.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/81c44543
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/81c44543
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/81c44543

Branch: refs/heads/master
Commit: 81c44543a3a33d7a48a57456e756fa3d1e944bd3
Parents: 5a96fa8
Author: Eric Avdey <eiri@eiri.ca>
Authored: Tue Jun 7 14:32:39 2016 -0300
Committer: Eric Avdey <eiri@eiri.ca>
Committed: Tue Jun 7 14:37:22 2016 -0300

----------------------------------------------------------------------
 src/chttpd_view.erl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/81c44543/src/chttpd_view.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_view.erl b/src/chttpd_view.erl
index eccf290..c1c72e8 100644
--- a/src/chttpd_view.erl
+++ b/src/chttpd_view.erl
@@ -33,8 +33,7 @@ multi_query_view(Req, Db, DDoc, ViewName, Queries) ->
         Acc1
     end, VAcc1, ArgQueries),
     {ok, Resp1} = chttpd:send_delayed_chunk(VAcc2#vacc.resp, "\r\n]}"),
-    {ok, Resp2} = chttpd:end_delayed_json_response(Resp1),
-    {ok, Resp2#vacc.resp}.
+    chttpd:end_delayed_json_response(Resp1).
 
 
 design_doc_view(Req, Db, DDoc, ViewName, Keys) ->


Mime
View raw message