summaryrefslogtreecommitdiff
path: root/bufferevent_sock.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-10-06 15:21:55 -0400
committerNick Mathewson <nickm@torproject.org>2011-10-06 15:21:55 -0400
commit83588777682b2a7d9044f527dc4acbec70775fa9 (patch)
tree2af8bf94b6b63037c43960817569a6b5475e2e21 /bufferevent_sock.c
parent5760efb1b67414e65e42ee7127286a7d9a7bd3a7 (diff)
parent706aa5f416a65107a3b40511ea91cff5ed048024 (diff)
downloadlibevent-83588777682b2a7d9044f527dc4acbec70775fa9.tar.gz
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts: buffer.c test/regress_buffer.c
Diffstat (limited to 'bufferevent_sock.c')
-rw-r--r--bufferevent_sock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/bufferevent_sock.c b/bufferevent_sock.c
index a37e302a..09c30604 100644
--- a/bufferevent_sock.c
+++ b/bufferevent_sock.c
@@ -329,6 +329,7 @@ bufferevent_socket_new(struct event_base *base, evutil_socket_t fd,
return NULL;
}
bufev = &bufev_p->bev;
+ evbuffer_set_flags(bufev->output, EVBUFFER_FLAG_DRAINS_TO_FD);
event_assign(&bufev->ev_read, bufev->ev_base, fd,
EV_READ|EV_PERSIST, bufferevent_readcb, bufev);