You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2014/02/08 19:32:11 UTC
couch-mrview commit: updated refs/heads/1993-bigcouch-couch-mrview to
13c1273
Updated Branches:
refs/heads/1993-bigcouch-couch-mrview 2497d524f -> 13c12731c
Remove duplication of check_view_etag function
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/13c12731
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/13c12731
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/13c12731
Branch: refs/heads/1993-bigcouch-couch-mrview
Commit: 13c12731c7c3c17351b8b9347b0cc8b15fc0d59a
Parents: 2497d52
Author: Russell Branca <ch...@gmail.com>
Authored: Sat Feb 8 10:32:07 2014 -0800
Committer: Russell Branca <ch...@gmail.com>
Committed: Sat Feb 8 10:32:07 2014 -0800
----------------------------------------------------------------------
src/couch_mrview_http.erl | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/13c12731/src/couch_mrview_http.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_http.erl b/src/couch_mrview_http.erl
index 8740003..1277c6a 100644
--- a/src/couch_mrview_http.erl
+++ b/src/couch_mrview_http.erl
@@ -112,11 +112,7 @@ all_docs_req(Req, Db, Keys) ->
do_all_docs_req(Req, Db, Keys) ->
Args0 = parse_qs(Req, Keys),
ETagFun = fun(Sig, Acc0) ->
- ETag = couch_httpd:make_etag(Sig),
- case couch_httpd:etag_match(Req, ETag) of
- true -> throw({etag_match, ETag});
- false -> {ok, Acc0#vacc{etag=ETag}}
- end
+ check_view_etag(Sig, Acc0, Req)
end,
Args = Args0#mrargs{preflight_fun=ETagFun},
{ok, Resp} = couch_httpd:etag_maybe(Req, fun() ->