Mercurial > hg > nginx

comparison src/http/modules/ngx_http_limit_req_module.c @ 4380:7697412a0921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Valentin Bartenev <vbart@nginx.com>
date Sun, 25 Dec 2011 19:32:31 +0000
parents d94d7104f598
children d2b3130fd8d9
comparison
equal deleted inserted replaced
4379:4e2551a83291 4380:7697412a0921
567 { 567 {
568 ngx_http_limit_req_conf_t *prev = parent; 568 ngx_http_limit_req_conf_t *prev = parent;
569 ngx_http_limit_req_conf_t *conf = child; 569 ngx_http_limit_req_conf_t *conf = child;
570 570
571 if (conf->shm_zone == NULL) { 571 if (conf->shm_zone == NULL) {
572 *conf = *prev; 572 conf->shm_zone = prev->shm_zone;
573 } 573 }
574 574
575 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, 575 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,
576 NGX_LOG_ERR); 576 NGX_LOG_ERR);
577 577