--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -1,5 +1,6 @@
 
 #include <ngx_config.h>
+#include <ngx_core.h>
 #include <ngx_types.h>
 #include <ngx_log.h>
 #include <ngx_connection.h>
@@ -22,21 +23,22 @@ int ngx_event_accept(ngx_event_t *ev)
     ev->ready = 0;
   
     do {
-        if ((s = accept(cn->fd, (struct sockaddr *) &addr, &addrlen)) == -1) {
+        if ((s = accept(cn->fd, cn->sockaddr, &cn->socklen)) == -1) {
             err = ngx_socket_errno;
             if (err == NGX_EAGAIN) {
                 ngx_log_error(NGX_LOG_INFO, ev->log, err,
-                             "ngx_event_accept: EAGAIN while accept");
-                return 0;
+                             "ngx_event_accept: EAGAIN while accept %s",
+                             cn->addr_text);
+                return NGX_OK;
             }
-            
+
             ngx_log_error(NGX_LOG_ERR, ev->log, err,
-                         "ngx_event_accept: accept failed");
-            /* if we return -1 listen socket would be closed */
-            return 0;
+                         "ngx_event_accept: accept %s failed", cn->addr_text);
+            /* if we return NGX_ERROR listen socket would be closed */
+            return NGX_OK;
         }
- 
-        ngx_log_debug(ev->log, "ngx_event_accept: accepted socket: %d" _ s);
+
+        ngx_log_debug(ev->log, "ngx_event_accept: accept: %d" _ s);
 
 #if !(HAVE_INHERITED_NONBLOCK)
         if (ngx_nonblocking(s) == -1)
@@ -48,6 +50,13 @@ int ngx_event_accept(ngx_event_t *ev)
         ngx_memzero(&ngx_write_events[s], sizeof(ngx_event_t));
         ngx_memzero(&ngx_connections[s], sizeof(ngx_connection_t));
 
+        ngx_connections[s].sockaddr = cn->sockaddr;
+        ngx_connections[s].family = cn->family;
+        ngx_connections[s].socklen = cn->socklen;
+        ngx_connections[s].addr = cn->addr;
+        ngx_connections[s].addr_textlen = cn->addr_textlen;
+        ngx_connections[s].post_accept_timeout = cn->post_accept_timeout;
+
         ngx_read_events[s].data = ngx_write_events[s].data
                                                          = &ngx_connections[s];
         ngx_connections[s].read = &ngx_read_events[s];
@@ -60,16 +69,16 @@ int ngx_event_accept(ngx_event_t *ev)
         ngx_write_events[s].timer = ngx_read_events[s].timer = 10000;
 
         ngx_write_events[s].timer_handler =
-            ngx_read_events[s].timer_handler = ngx_event_close;
+            ngx_read_events[s].timer_handler = ngx_event_close_connection;
 
         ngx_write_events[s].close_handler =
-            ngx_read_events[s].close_handler = ngx_event_close;
+            ngx_read_events[s].close_handler = ngx_event_close_connection;
 
         ngx_connections[s].server = cn->server;
         ngx_connections[s].servers = cn->servers;
         ngx_connections[s].log =
             ngx_read_events[s].log = ngx_write_events[s].log = ev->log;
-    
+
 #if (HAVE_DEFERRED_ACCEPT)
         if (ev->accept_filter)
             ngx_read_events[s].ready = 1;