# HG changeset patch # User Maxim Dounin # Date 1344269975 0 # Node ID ad072e83f2a9a07c2ae7a2860c848e4d2f2b48b8 # Parent 93119eae378af30aa4cd9a287a6bf8d78d6f06a5 Merge of r4757: debugging messages in limit_conn. Fixed debugging messages to account that limit_zone was renamed to limit_conn. diff --git a/src/http/modules/ngx_http_limit_conn_module.c b/src/http/modules/ngx_http_limit_conn_module.c --- a/src/http/modules/ngx_http_limit_conn_module.c +++ b/src/http/modules/ngx_http_limit_conn_module.c @@ -238,7 +238,7 @@ ngx_http_limit_conn_handler(ngx_http_req } ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "limit zone: %08XD %d", node->key, lc->conn); + "limit conn: %08XD %d", node->key, lc->conn); ngx_shmtx_unlock(&shpool->mutex); @@ -358,7 +358,7 @@ ngx_http_limit_conn_cleanup(void *data) ngx_shmtx_lock(&shpool->mutex); ngx_log_debug2(NGX_LOG_DEBUG_HTTP, lccln->shm_zone->shm.log, 0, - "limit zone cleanup: %08XD %d", node->key, lc->conn); + "limit conn cleanup: %08XD %d", node->key, lc->conn); lc->conn--;