1 files changed, 49 insertions, 27 deletions

diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index a44ff0607..70e864b78 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -4,9 +4,27 @@
 
 int ngx_event_connect_peer(ngx_peer_connecttion_t *pc)
 {
-    time_t   now;
+    time_t        now;
+    ngx_socket_t  s;
 
-    /* TODO: cached connection */
+    /* ngx_lock_mutex(pc->peers->mutex); */
+
+    if (pc->peers->last_cached) {
+
+        /* cached connection */
+
+        pc->connection = pc->peers->cached[pc->peers->last_cached]
+        pc->peers->last_cached--;
+
+        /* ngx_unlock_mutex(pc->peers->mutex); */
+
+        pc->cached = 1;
+        return NGX_OK;
+    }
+
+    /* ngx_unlock_mutex(pc->peers->mutex); */
+
+    pc->cached = 0;
 
     now = ngx_time();
 
@@ -71,26 +89,24 @@ int ngx_event_connect_peer(ngx_peer_connecttion_t *pc)
         }
     }
 
-
-
-
+    pc->addr_port_text = peer->addr_port_text;
 
     s = ngx_socket(AF_INET, SOCK_STREAM, IPPROTO_IP, 0);
 
     if (s == -1) {
-        ngx_log_error(NGX_LOG_ALERT, cp->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
                       ngx_socket_n " failed");
         return NGX_ERROR;
     }
 
-    if (cp->rcvbuf) {
+    if (pc->rcvbuf) {
         if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-                       (const void *) &cp->rcvbuf, sizeof(int)) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cp->log, ngx_socket_errno,
+                       (const void *) &pc->rcvbuf, sizeof(int)) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
                           "setsockopt(SO_RCVBUF) failed");
 
             if (ngx_close_socket(s) == -1) {
-                ngx_log_error(NGX_LOG_ALERT, cp->log, ngx_socket_errno,
+                ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
                               ngx_close_socket_n " failed");
             }
 
@@ -99,11 +115,11 @@ int ngx_event_connect_peer(ngx_peer_connecttion_t *pc)
     }
 
     if (ngx_nonblocking(s) == -1) {
-        ngx_log_error(NGX_LOG_ALERT, cn->log, ngx_socket_errno,
+        ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
                       ngx_nonblocking_n " failed");
 
         if (ngx_close_socket(s) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cn->log, ngx_socket_errno,
+            ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
                           ngx_close_socket_n " failed");
         }
 
@@ -111,17 +127,17 @@ int ngx_event_connect_peer(ngx_peer_connecttion_t *pc)
     }
 
 #if (WIN32)
-        /*
-         * Winsock assignes a socket number divisible by 4
-         * so to find a connection we divide a socket number by 4.
-         */
-
-        if (s % 4) {
-            ngx_log_error(NGX_LOG_EMERG, cp->log, 0,
-                          ngx_socket_n
-                          " created socket %d, not divisible by 4", s);
-            exit(1);
-        }
+    /*
+     * Winsock assignes a socket number divisible by 4
+     * so to find a connection we divide a socket number by 4.
+     */
+
+    if (s % 4) {
+        ngx_log_error(NGX_LOG_EMERG, pc->log, 0,
+                      ngx_socket_n
+                      " created socket %d, not divisible by 4", s);
+        exit(1);
+    }
 
     c = &ngx_cycle->connections[s / 4];
     rev = &ngx_cycle->read_events[s / 4];
@@ -148,9 +164,15 @@ int ngx_event_connect_peer(ngx_peer_connecttion_t *pc)
 
     rev->instance = wev->instance = !instance;
 
-    !!!!!!!!!!!!!!!
-
-    rev->log = wev->log = c->log = cn->log;
+    rev->log = wev->log = c->log = pc->log;
     c->fd = s;
-    wev->close_handler = rev->close_handler = ngx_event_close_connection;
+
+    pc->connection = c;
+
+    if (ngx_add_conn) {
+        if (ngx_add_conn(c) == NGX_ERROR) {
+            return NGX_ERROR;
+        }
+    } 
+
 }