# HG changeset patch # User Valentin Bartenev # Date 1328870938 0 # Node ID 2d4ff8bd56493a42e1767bc7edfba5bf06af5c2a # Parent 50f463258eeaaa1d38e6756f395568b18ed4ef65 Limit conn: returned to the old behavior of using the first actual limit on the way. It was unintentionally changed in r4272, so that it could only limit the first location where the processing of the request has reached PREACCESS phase. 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 @@ -159,8 +159,6 @@ ngx_http_limit_conn_handler(ngx_http_req return NGX_DECLINED; } - r->main->limit_conn_set = 1; - lccf = ngx_http_get_module_loc_conf(r, ngx_http_limit_conn_module); limits = lccf->limits.elts; @@ -187,6 +185,8 @@ ngx_http_limit_conn_handler(ngx_http_req continue; } + r->main->limit_conn_set = 1; + hash = ngx_crc32_short(vv->data, len); shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr;