mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
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.
This commit is contained in:
@@ -159,8 +159,6 @@ ngx_http_limit_conn_handler(ngx_http_request_t *r)
|
||||
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_request_t *r)
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user