couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From beno...@apache.org
Subject [01/10] couch-httpd commit: updated refs/heads/1994-merge-rcouch to 82e454a
Date Sun, 13 Jul 2014 12:34:16 GMT
Repository: couchdb-couch-httpd
Updated Branches:
  refs/heads/1994-merge-rcouch e0ba70fea -> 82e454a9d


correctly pass timeout and heartbeat options.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/697f5f05
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/697f5f05
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/697f5f05

Branch: refs/heads/1994-merge-rcouch
Commit: 697f5f05d248350fc2c50dd8c666d20559a26a52
Parents: 68bc4a2
Author: benoitc <bchesneau@gmail.com>
Authored: Wed Jul 2 11:00:49 2014 +0200
Committer: benoitc <bchesneau@gmail.com>
Committed: Sun Jul 13 14:33:19 2014 +0200

----------------------------------------------------------------------
 src/couch_httpd_changes.erl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/697f5f05/src/couch_httpd_changes.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_changes.erl b/src/couch_httpd_changes.erl
index 4f2bd83..af21792 100644
--- a/src/couch_httpd_changes.erl
+++ b/src/couch_httpd_changes.erl
@@ -176,13 +176,18 @@ handle_view_changes(#db{name=DbName}=Db0, DDocId, VName, ViewOptions,
     #changes_args{
         feed = ResponseType,
         since = Since,
-        db_open_options = DbOptions} = ChangesArgs,
+        db_open_options = DbOptions,
+        heartbeat=Heartbeat,
+        timeout=Timeout} = ChangesArgs,
 
     Refresh = refresh_option(Req),
 
     Options0 = [{since, Since},
                 {view_options, ViewOptions},
-                {refresh, Refresh}],
+                {refresh, Refresh},
+                {heartbeat, Heartbeat},
+                {timeout, Timeout}],
+
     Options = case ResponseType of
         "continuous" -> [stream | Options0];
         "eventsource" -> [stream | Options0];


Mime
View raw message