aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug38055
-rw-r--r--src/or/connection.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/changes/bug3805 b/changes/bug3805
new file mode 100644
index 000000000..9d12b8146
--- /dev/null
+++ b/changes/bug3805
@@ -0,0 +1,5 @@
+ o Major bugfixes (bufferevents):
+ - Correctly notice when data has been written from a bufferevent
+ without flushing it completely. Bugfix on 0.2.3.1-alpha; fixes
+ bug 3805.
+
diff --git a/src/or/connection.c b/src/or/connection.c
index c4cbef4c9..dc804ddce 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2947,6 +2947,11 @@ connection_configure_bufferevent_callbacks(connection_t *conn)
connection_handle_write_cb,
connection_handle_event_cb,
conn);
+ /* Set a fairly high write low-watermark so that we get the write callback
+ called whenever data is written to bring us under 128K. Leave the
+ high-watermark at 0.
+ */
+ bufferevent_setwatermark(bufev, EV_WRITE, 128*1024, 0);
input = bufferevent_get_input(bufev);
output = bufferevent_get_output(bufev);