couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to 297493f
Date Tue, 27 Sep 2016 23:06:40 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master f1d0c5dc8 -> 297493f29


Fix eventsource timeout handling

COUCHDB-3164


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

Branch: refs/heads/master
Commit: 297493f29978d6effd9ae865b5822f54261c6955
Parents: f1d0c5d
Author: Robert Newson <rnewson@apache.org>
Authored: Tue Sep 27 23:44:54 2016 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Tue Sep 27 23:47:13 2016 +0100

----------------------------------------------------------------------
 src/chttpd_db.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/297493f2/src/chttpd_db.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_db.erl b/src/chttpd_db.erl
index 5b672d7..07a5eba 100644
--- a/src/chttpd_db.erl
+++ b/src/chttpd_db.erl
@@ -160,7 +160,7 @@ changes_callback(timeout, #cacc{feed = eventsource} = Acc) ->
     #cacc{mochi = Resp} = Acc,
     Chunk = "event: heartbeat\ndata: \n\n",
     {ok, Resp1} = chttpd:send_delayed_chunk(Resp, Chunk),
-    {ok, {"eventsource", Resp1}};
+    {ok, Acc#cacc{mochi = Resp1}};
 changes_callback({stop, _EndSeq}, #cacc{feed = eventsource} = Acc) ->
     #cacc{mochi = Resp, buffer = Buf} = Acc,
     {ok, Resp1} = chttpd:send_delayed_chunk(Resp, Buf),


Mime
View raw message