mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-08 02:02:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upstream: removed rudiments of upstream connection caching.

Browse Source 
This functionality is now provided by ngx_http_upstream_keepalive_module.
This commit is contained in:
Ruslan Ermilov 2013-03-25 14:51:44 +00:00
parent 4d9fdd86f7
commit ea327f13f1
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/http/ngx_http_upstream_round_robin.c
View File

@ -373,7 +373,6 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
ngx_int_t rc; ngx_int_t rc;
ngx_uint_t i, n; ngx_uint_t i, n;
ngx_connection_t *c;
ngx_http_upstream_rr_peer_t *peer; ngx_http_upstream_rr_peer_t *peer;
ngx_http_upstream_rr_peers_t *peers; 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); */ /* 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->cached = 0;
pc->connection = NULL; pc->connection = NULL;

2
src/http/ngx_http_upstream_round_robin.h
View File

@ -42,10 +42,8 @@ typedef struct ngx_http_upstream_rr_peers_s ngx_http_upstream_rr_peers_t;
struct ngx_http_upstream_rr_peers_s { struct ngx_http_upstream_rr_peers_s {
ngx_uint_t number; ngx_uint_t number;
ngx_uint_t last_cached;
/* ngx_mutex_t *mutex; */ /* ngx_mutex_t *mutex; */
ngx_connection_t **cached;
ngx_uint_t total_weight; ngx_uint_t total_weight;