IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-29 12:14:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed limit_req burst/nodelay inheritance (ticket #76).

Browse Source 
The problem was introduced in r4381 (1.1.12).
This commit is contained in:
Maxim Dounin 2012-01-11 11:09:05 +00:00
parent b8ef9d9255
commit f2ef9db230
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_limit_req_module.c
View File

@ -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,