IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-01 03:36:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed limit_conn_log_level/limit_req_log_level inheritance.

Browse Source 
The directives did not work if there were no limit_conn/limit_req specified on
the same level.
This commit is contained in:
Valentin Bartenev 2011-12-25 19:32:31 +00:00
parent 197312f3a0
commit 39f01e526f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,7 +483,7 @@ ngx_http_limit_conn_merge_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_limit_conn_conf_t *conf = child;
if (conf->limits.elts == NULL) {
*conf = *prev;
conf->limits = prev->limits;
}
ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);

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

@ -569,7 +569,7 @@ ngx_http_limit_req_merge_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_limit_req_conf_t *conf = child;
if (conf->shm_zone == NULL) {
*conf = *prev;
conf->shm_zone = prev->shm_zone;
}
ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,