Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge of r4381, r4400: 

Fixed limit_conn_log_level/limit_req_log_level inheritance.  The
directives did not work if there were no limit_conn/limit_req
specified on the same level.

The code for limit_conn is different in 1.0.x, conflict resolved
manually.
This commit is contained in:
Maxim Dounin 2012-02-05 15:47:58 +00:00
parent 217ccc41c5
commit 4e0e62712f
2 changed files with 5 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_req_module.c
View File

@ -569,7 +569,9 @@ 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;
conf->burst = prev->burst;
conf->nodelay = prev->nodelay;
}
ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,

3
src/http/modules/ngx_http_limit_zone_module.c
View File

@ -421,7 +421,8 @@ ngx_http_limit_zone_merge_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_http_limit_zone_conf_t *conf = child;
if (conf->shm_zone == NULL) {
*conf = *prev;
conf->shm_zone = prev->shm_zone;
conf->conn = prev->conn;
}
ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);