summaryrefslogtreecommitdiffhomepage
path: root/src/http/ngx_http_upstream_round_robin.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2013-03-25 14:51:44 +0000
committerRuslan Ermilov <ru@nginx.com>2013-03-25 14:51:44 +0000
commitea327f13f130be87cf3023e215d1c97b5465343f (patch)
treec04a20d5e87d6d56a771414035072be9b38f2254 /src/http/ngx_http_upstream_round_robin.c
parent4d9fdd86f7163286e9423b37954ac3e79385c3ff (diff)
downloadnginx-ea327f13f130be87cf3023e215d1c97b5465343f.tar.gz
nginx-ea327f13f130be87cf3023e215d1c97b5465343f.tar.bz2
Upstream: removed rudiments of upstream connection caching.
This functionality is now provided by ngx_http_upstream_keepalive_module.
Diffstat (limited to 'src/http/ngx_http_upstream_round_robin.c')
-rw-r--r--src/http/ngx_http_upstream_round_robin.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index d1331f4f8..d786ed142 100644
--- 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(ngx_peer_connection_t *pc, void *data)
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(ngx_peer_connection_t *pc, void *data)
/* 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;