Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_limit_req_module.c @ 658:5a4401b9551b NGINX_1_1_13
nginx 1.1.13
*) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the
"ssl_protocols" directive.
*) Bugfix: the "limit_req" directive parameters were not inherited
correctly; the bug had appeared in 1.1.12.
*) Bugfix: the "proxy_redirect" directive incorrectly processed
"Refresh" header if regular expression were used.
*) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter
did not return answer from cache if there were no live upstreams.
*) Bugfix: the "worker_cpu_affinity" directive might not work.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.1.12.
*) Bugfix: in the ngx_http_mp4_module.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 16 Jan 2012 00:00:00 +0400 |
| parents | 9d21dad0b5a1 |
| children | d0f7a625f27c |
comparison
equal
deleted
inserted
replaced
| 657:e1296af53cc0 | 658:5a4401b9551b |
|---|---|
| 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->shm_zone = prev->shm_zone; | 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 |