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/05/29 00:45:15 UTC
[9/9] chttpd commit: updated
refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed to
002a908
Support Last-Event-ID header for eventsource changes feeds
COUCHDB-1852
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/002a9081
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/002a9081
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/002a9081
Branch: refs/heads/1843-feature-bigcouch-clustered-eventsource-changes-feed
Commit: 002a908132bfe6a74e4a886fc539a3b7987d4c63
Parents: f61dc27
Author: Damjan Georgievski <gd...@gmail.com>
Authored: Sat Jul 20 15:46:04 2013 +0100
Committer: Russell Branca <ch...@apache.org>
Committed: Wed May 28 15:44:57 2014 -0700
----------------------------------------------------------------------
src/chttpd_db.erl | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/002a9081/src/chttpd_db.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl
index e84bb15..6ffe9e4 100644
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@ -1213,7 +1213,7 @@ parse_doc_query(Req) ->
end, #doc_query_args{}, chttpd:qs(Req)).
parse_changes_query(Req) ->
- lists:foldl(fun({Key, Value}, Args) ->
+ ChangesArgs = lists:foldl(fun({Key, Value}, Args) ->
case {string:to_lower(Key), Value} of
{"feed", _} ->
Args#changes_args{feed=Value};
@@ -1242,7 +1242,21 @@ parse_changes_query(Req) ->
_Else -> % unknown key value pair, ignore.
Args
end
- end, #changes_args{}, couch_httpd:qs(Req)).
+ end, #changes_args{}, couch_httpd:qs(Req)),
+ %% if it's an EventSource request with a Last-event-ID header
+ %% that should override the `since` query string, since it's
+ %% probably the browser reconnecting.
+ case ChangesArgs#changes_args.feed of
+ "eventsource" ->
+ case couch_httpd:header_value(Req, "last-event-id") of
+ undefined ->
+ ChangesArgs;
+ Value ->
+ ChangesArgs#changes_args{since=list_to_integer(Value)}
+ end;
+ _ ->
+ ChangesArgs
+ end.
extract_header_rev(Req, ExplicitRev) when is_binary(ExplicitRev) or is_list(ExplicitRev)->
extract_header_rev(Req, couch_doc:parse_rev(ExplicitRev));