Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_limit_conn_module.c @ 682:5cb5db9975ba NGINX_1_3_4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.4 *) Change: the "ipv6only" parameter is now turned on by default for listening IPv6 sockets. *) Feature: the Clang compiler support. *) Bugfix: extra listening sockets might be created. Thanks to Roman Odaisky. *) Bugfix: nginx/Windows might hog CPU if a worker process failed to start. Thanks to Ricardo Villalobos Guevara. *) Bugfix: the "proxy_pass_header", "fastcgi_pass_header", "scgi_pass_header", "uwsgi_pass_header", "proxy_hide_header", "fastcgi_hide_header", "scgi_hide_header", and "uwsgi_hide_header" directives might be inherited incorrectly.
author Igor Sysoev <http://sysoev.ru>
date Tue, 31 Jul 2012 00:00:00 +0400
parents f5b859b2f097
children 660139fd80ca
comparison
equal deleted inserted replaced
681:625501f84a6b 682:5cb5db9975ba
236 236
237 lc->conn++; 237 lc->conn++;
238 } 238 }
239 239
240 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, 240 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
241 "limit zone: %08XD %d", node->key, lc->conn); 241 "limit conn: %08XD %d", node->key, lc->conn);
242 242
243 ngx_shmtx_unlock(&shpool->mutex); 243 ngx_shmtx_unlock(&shpool->mutex);
244 244
245 cln = ngx_pool_cleanup_add(r->pool, 245 cln = ngx_pool_cleanup_add(r->pool,
246 sizeof(ngx_http_limit_conn_cleanup_t)); 246 sizeof(ngx_http_limit_conn_cleanup_t));
356 lc = (ngx_http_limit_conn_node_t *) &node->color; 356 lc = (ngx_http_limit_conn_node_t *) &node->color;
357 357
358 ngx_shmtx_lock(&shpool->mutex); 358 ngx_shmtx_lock(&shpool->mutex);
359 359
360 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0, 360 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0,
361 "limit zone cleanup: %08XD %d", node->key, lc->conn); 361 "limit conn cleanup: %08XD %d", node->key, lc->conn);
362 362
363 lc->conn--; 363 lc->conn--;
364 364
365 if (lc->conn == 0) { 365 if (lc->conn == 0) {
366 ngx_rbtree_delete(ctx->rbtree, node); 366 ngx_rbtree_delete(ctx->rbtree, node);