Mercurial > hg > nginx
comparison src/http/modules/ngx_http_limit_zone_module.c @ 4440:97995d63aa36 stable-1.0
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 | 23d567eabc5d |
children | 4919fb357a5d |
comparison
equal
deleted
inserted
replaced
4439:5c97978d2717 | 4440:97995d63aa36 |
---|---|
419 { | 419 { |
420 ngx_http_limit_zone_conf_t *prev = parent; | 420 ngx_http_limit_zone_conf_t *prev = parent; |
421 ngx_http_limit_zone_conf_t *conf = child; | 421 ngx_http_limit_zone_conf_t *conf = child; |
422 | 422 |
423 if (conf->shm_zone == NULL) { | 423 if (conf->shm_zone == NULL) { |
424 *conf = *prev; | 424 conf->shm_zone = prev->shm_zone; |
425 conf->conn = prev->conn; | |
425 } | 426 } |
426 | 427 |
427 ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR); | 428 ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR); |
428 | 429 |
429 return NGX_CONF_OK; | 430 return NGX_CONF_OK; |