mirror of
https://github.com/nginx/nginx.git
synced 2026-06-27 04:12:05 +00:00
Fixed limit_req burst/nodelay inheritance (ticket #76).
The problem was introduced in r4381 (1.1.12).
This commit is contained in:
parent
b8ef9d9255
commit
f2ef9db230
1 changed files with 2 additions and 0 deletions
|
|
@ -570,6 +570,8 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child)
|
|||
|
||||
if (conf->shm_zone == NULL) {
|
||||
conf->shm_zone = prev->shm_zone;
|
||||
conf->burst = prev->burst;
|
||||
conf->nodelay = prev->nodelay;
|
||||
}
|
||||
|
||||
ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue