Purge view_query_args and point to mrargs (when rebasing, pull in the other bits from ba152cb2153e892c0d8eec7f6fbeecf3dcaff10a)
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/0c4e11d4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/0c4e11d4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/0c4e11d4 Branch: refs/heads/import Commit: 0c4e11d413df7d14f8e209543fc37255c84226e9 Parents: b5f683c Author: Robert Newson <rnew...@apache.org> Authored: Mon Dec 23 11:44:52 2013 +0000 Committer: Paul J. Davis <paul.joseph.da...@gmail.com> Committed: Fri Jan 17 13:36:28 2014 -0800 ---------------------------------------------------------------------- src/chttpd_misc.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/0c4e11d4/src/chttpd_misc.erl ---------------------------------------------------------------------- diff --git a/src/chttpd_misc.erl b/src/chttpd_misc.erl index a730801..8c5f50e 100644 --- a/src/chttpd_misc.erl +++ b/src/chttpd_misc.erl @@ -21,6 +21,7 @@ -include_lib("couch/include/couch_db.hrl"). +-include_lib("couch_mrview/include/couch_mrview.hrl"). -import(chttpd, [send_json/2,send_json/3,send_method_not_allowed/2, @@ -96,7 +97,7 @@ handle_all_dbs_req(#httpd{method='GET'}=Req) -> chttpd:etag_respond(Req, Etag, fun() -> {ok, Resp} = chttpd:start_delayed_json_response(Req, 200, [{"Etag",Etag}]), fabric:all_docs(ShardDbName, fun all_dbs_callback/2, - {nil, Resp}, #view_query_args{}) + {nil, Resp}, #mrargs{}) end); handle_all_dbs_req(Req) -> send_method_not_allowed(Req, "GET,HEAD").
