couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [4/4] chttpd commit: updated refs/heads/master to 7189115
Date Fri, 30 Jan 2015 18:11:00 GMT
Merge remote-tracking branch 'iilyak/1145-_local_docs-handler'

Conflicts:
	src/chttpd_db.erl

This closes #16

COUCHDB-1145


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

Branch: refs/heads/master
Commit: 71891153619e6b6fcc4ce6aff13b20e1cc85972d
Parents: 1e41311 0525f3e
Author: Alexander Shorin <kxepal@apache.org>
Authored: Fri Jan 30 10:39:23 2015 +0300
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Fri Jan 30 21:01:45 2015 +0300

----------------------------------------------------------------------
 src/chttpd_db.erl | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/71891153/src/chttpd_db.erl
----------------------------------------------------------------------
diff --cc src/chttpd_db.erl
index d40754d,105553f..f88131a
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@@ -532,14 -537,13 +537,15 @@@ db_req(#httpd{path_parts=[_, DocId]}=Re
  db_req(#httpd{path_parts=[_, DocId | FileNameParts]}=Req, Db) ->
      db_attachment_req(Req, Db, DocId, FileNameParts).
  
- all_docs_view(Req, Db, Keys) ->
+ all_docs_view(Req, Db, Keys, OP) ->
      Args0 = couch_mrview_http:parse_params(Req, Keys),
 -    Args1 = set_namespace(OP, Args0),
 +    Args1 = Args0#mrargs{view_type=map},
 +    Args2 = couch_mrview_util:validate_args(Args1),
++    Args3 = set_namespace(OP, Args2),
      ETagFun = fun(Sig, Acc0) ->
          couch_mrview_http:check_view_etag(Sig, Acc0, Req)
      end,
-     Args = Args2#mrargs{preflight_fun=ETagFun},
 -    Args = Args1#mrargs{preflight_fun=ETagFun},
++    Args = Args3#mrargs{preflight_fun=ETagFun},
      Options = [{user_ctx, Req#httpd.user_ctx}],
      {ok, Resp} = couch_httpd:etag_maybe(Req, fun() ->
          VAcc0 = #vacc{db=Db, req=Req},


Mime
View raw message