diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2009-11-30 18:33:59 +0000 |
|---|---|---|
| committer | Adam Kocoloski <kocolosk@apache.org> | 2009-11-30 18:33:59 +0000 |
| commit | b409b8836b82612880df1628cf831d0420e5eb2a (patch) | |
| tree | a6f9052f5f1d9446c0a36191aa23ded7bce93e94 /src | |
| parent | 85809452290b99a0a00a91dd319b82f51f9f0c4a (diff) | |
ETags on POSTs to _view and _list should depend on Keys. COUCHDB-586
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@885529 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/couchdb/couch_httpd_show.erl | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd_show.erl b/src/couchdb/couch_httpd_show.erl index 14b9b415..5c95070a 100644 --- a/src/couchdb/couch_httpd_show.erl +++ b/src/couchdb/couch_httpd_show.erl @@ -191,7 +191,7 @@ output_map_list(#httpd{mochi_req=MReq, user_ctx=UserCtx}=Req, Lang, ListSrc, Vie Headers = MReq:get(headers), Hlist = mochiweb_headers:to_list(Headers), Accept = proplists:get_value('Accept', Hlist), - CurrentEtag = couch_httpd_view:view_group_etag(Group, Db, {Lang, ListSrc, Accept, UserCtx}), + CurrentEtag = couch_httpd_view:view_group_etag(Group, Db, {Lang, ListSrc, Accept, UserCtx, Keys}), couch_httpd:etag_respond(Req, CurrentEtag, fun() -> % get the os process here % pass it into the view fold with closures diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index cb9f8687..af91b654 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -202,7 +202,7 @@ output_reduce_view(Req, Db, View, Group, QueryArgs, Keys) -> skip = Skip, group_level = GroupLevel } = QueryArgs, - CurrentEtag = view_group_etag(Group, Db), + CurrentEtag = view_group_etag(Group, Db, Keys), couch_httpd:etag_respond(Req, CurrentEtag, fun() -> {ok, GroupRowsFun, RespFun} = make_reduce_fold_funs(Req, GroupLevel, QueryArgs, CurrentEtag, #reduce_fold_helper_funs{}), {Resp, _RedAcc3} = lists:foldl( |