mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-01 11:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Limit conn: returned to the old behavior of using the first actual limit on

Browse Source 
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.
This commit is contained in:
Valentin Bartenev 2012-02-10 10:48:58 +00:00
parent e35ff2a08c
commit 9e8708cbd6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/modules/ngx_http_limit_conn_module.c
View File

@ -159,8 +159,6 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
return NGX_DECLINED; return NGX_DECLINED;
} }
r->main->limit_conn_set = 1;
lccf = ngx_http_get_module_loc_conf(r, ngx_http_limit_conn_module); lccf = ngx_http_get_module_loc_conf(r, ngx_http_limit_conn_module);
limits = lccf->limits.elts; limits = lccf->limits.elts;
@ -187,6 +185,8 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
continue; continue;
} }
r->main->limit_conn_set = 1;
hash = ngx_crc32_short(vv->data, len); hash = ngx_crc32_short(vv->data, len);
shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr; shpool = (ngx_slab_pool_t *) limits[i].shm_zone->shm.addr;