Mercurial > hg > nginx

comparison src/http/modules/ngx_http_limit_req_module.c @ 4440:97995d63aa36 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Sun, 05 Feb 2012 15:47:58 +0000
parents d94d7104f598
children 4919fb357a5d
comparison
equal deleted inserted replaced
4439:5c97978d2717 4440:97995d63aa36
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 conf->burst = prev->burst;
574 conf->nodelay = prev->nodelay;
573 } 575 }
574 576
575 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level, 577 ngx_conf_merge_uint_value(conf->limit_log_level, prev->limit_log_level,
576 NGX_LOG_ERR); 578 NGX_LOG_ERR);
577 579