Merge remote-tracking branch 'origin/master' into rahm

1 files changed, 7 insertions, 1 deletions

diff --git a/control.c b/control.c
index 73286e00..302c2956 100644
--- a/control.c
+++ b/control.c
@@ -775,7 +775,6 @@ control_start(struct client *c)
 
 	cs->read_event = bufferevent_new(c->fd, control_read_callback,
 	    control_write_callback, control_error_callback, c);
-	bufferevent_enable(cs->read_event, EV_READ);
 
 	if (c->flags & CLIENT_CONTROLCONTROL)
 		cs->write_event = cs->read_event;
@@ -792,6 +791,13 @@ control_start(struct client *c)
 	}
 }
 
+/* Control client ready. */
+void
+control_ready(struct client *c)
+{
+	bufferevent_enable(c->control_state->read_event, EV_READ);
+}
+
 /* Discard all output for a client. */
 void
 control_discard(struct client *c)