1 files changed, 12 insertions, 4 deletions

diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 717a4a4b7..1a61ef7fc 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -158,15 +158,23 @@ int ngx_event_connect_peer(ngx_peer_connection_t *pc)
     ngx_memzero(rev, sizeof(ngx_event_t));
     ngx_memzero(wev, sizeof(ngx_event_t));
 
-    rev->index = wev->index = NGX_INVALID_INDEX;
-    rev->data = wev->data = c;
+    rev->index = NGX_INVALID_INDEX;
+    wev->index = NGX_INVALID_INDEX;
+
+    rev->data = c;
+    wev->data = c;
+
     c->read = rev;
     c->write = wev;
     wev->write = 1;
 
-    rev->instance = wev->instance = !instance;
+    rev->instance = !instance;
+    wev->instance = !instance;
+
+    c->log = pc->log;
+    rev->log = pc->log;
+    wev->log = pc->log;
 
-    rev->log = wev->log = c->log = pc->log;
     c->fd = s;
 
     pc->connection = c;