Mercurial > hg > nginx

comparison src/http/modules/ngx_http_limit_conn_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 91874133fb27
children d620f497c50f
comparison
equal deleted inserted replaced
4379:4e2551a83291 4380:7697412a0921
481 { 481 {
482 ngx_http_limit_conn_conf_t *prev = parent; 482 ngx_http_limit_conn_conf_t *prev = parent;
483 ngx_http_limit_conn_conf_t *conf = child; 483 ngx_http_limit_conn_conf_t *conf = child;
484 484
485 if (conf->limits.elts == NULL) { 485 if (conf->limits.elts == NULL) {
486 *conf = *prev; 486 conf->limits = prev->limits;
487 } 487 }
488 488
489 ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR); 489 ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR);
490 490
491 return NGX_CONF_OK; 491 return NGX_CONF_OK;