Mercurial > hg > nginx

changeset 5136:88a302caca75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: removed rudiments of upstream connection caching. This functionality is now provided by ngx_http_upstream_keepalive_module.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 25 Mar 2013 14:51:44 +0000
parents 0811376954e4
children f941cf265cc5
files src/http/ngx_http_upstream_round_robin.c src/http/ngx_http_upstream_round_robin.h
diffstat 2 files changed, 0 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -373,7 +373,6 @@ ngx_http_upstream_get_round_robin_peer(n
 
     ngx_int_t                      rc;
     ngx_uint_t                     i, n;
-    ngx_connection_t              *c;
     ngx_http_upstream_rr_peer_t   *peer;
     ngx_http_upstream_rr_peers_t  *peers;
 
@@ -382,26 +381,6 @@ ngx_http_upstream_get_round_robin_peer(n
 
     /* ngx_lock_mutex(rrp->peers->mutex); */
 
-    if (rrp->peers->last_cached) {
-
-        /* cached connection */
-
-        c = rrp->peers->cached[rrp->peers->last_cached];
-        rrp->peers->last_cached--;
-
-        /* ngx_unlock_mutex(ppr->peers->mutex); */
-
-#if (NGX_THREADS)
-        c->read->lock = c->read->own_lock;
-        c->write->lock = c->write->own_lock;
-#endif
-
-        pc->connection = c;
-        pc->cached = 1;
-
-        return NGX_OK;
-    }
-
     pc->cached = 0;
     pc->connection = NULL;
 
--- a/src/http/ngx_http_upstream_round_robin.h
+++ b/src/http/ngx_http_upstream_round_robin.h
@@ -42,10 +42,8 @@ typedef struct ngx_http_upstream_rr_peer
 
 struct ngx_http_upstream_rr_peers_s {
     ngx_uint_t                      number;
-    ngx_uint_t                      last_cached;
 
  /* ngx_mutex_t                    *mutex; */
-    ngx_connection_t              **cached;
 
     ngx_uint_t                      total_weight;