Mercurial > hg > nginx-vendor-1-0
comparison src/http/modules/ngx_http_limit_zone_module.c @ 644:ad25218fd14b NGINX_1_0_12
nginx 1.0.12
*) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the
"ssl_protocols" directive.
*) Feature: the "if" SSI command supports captures in regular
expressions.
*) Bugfix: the "if" SSI command did not work inside the "block" command.
*) Bugfix: in AIO error handling on FreeBSD.
*) Bugfix: in the OpenSSL library initialization.
*) Bugfix: the "worker_cpu_affinity" directive might not work.
*) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
directives might not work.
*) Bugfix: the "read_ahead" directive might not work combined with
"try_files" and "open_file_cache".
*) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter
did not return answer from cache if there were no live upstreams.
*) Bugfix: a segmentation fault might occur in a worker process if small
time was used in the "inactive" parameter of the "proxy_cache_path"
directive.
*) Bugfix: responses from cache might hang.
*) Bugfix: in error handling while connecting to a backend.
Thanks to Piotr Sikora.
*) Bugfix: in the "epoll" event method.
Thanks to Yichun Zhang.
*) Bugfix: the $sent_http_cache_control variable might contain a wrong
value if the "expires" directive was used.
Thanks to Yichun Zhang.
*) Bugfix: the "limit_rate" directive did not allow to use full
throughput, even if limit value was very high.
*) Bugfix: the "sendfile_max_chunk" directive did not work, if the
"limit_rate" directive was used.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
1.0.11.
*) Bugfix: in the ngx_http_scgi_module.
*) Bugfix: in the ngx_http_mp4_module.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 06 Feb 2012 00:00:00 +0400 |
parents | f7ec98e3caeb |
children | 09a689c5e494 |
comparison
equal
deleted
inserted
replaced
643:d81e1c257a02 | 644:ad25218fd14b |
---|---|
1 | 1 |
2 /* | 2 /* |
3 * Copyright (C) Igor Sysoev | 3 * Copyright (C) Igor Sysoev |
4 * Copyright (C) Nginx, Inc. | |
4 */ | 5 */ |
5 | 6 |
6 | 7 |
7 #include <ngx_config.h> | 8 #include <ngx_config.h> |
8 #include <ngx_core.h> | 9 #include <ngx_core.h> |
419 { | 420 { |
420 ngx_http_limit_zone_conf_t *prev = parent; | 421 ngx_http_limit_zone_conf_t *prev = parent; |
421 ngx_http_limit_zone_conf_t *conf = child; | 422 ngx_http_limit_zone_conf_t *conf = child; |
422 | 423 |
423 if (conf->shm_zone == NULL) { | 424 if (conf->shm_zone == NULL) { |
424 *conf = *prev; | 425 conf->shm_zone = prev->shm_zone; |
426 conf->conn = prev->conn; | |
425 } | 427 } |
426 | 428 |
427 ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR); | 429 ngx_conf_merge_uint_value(conf->log_level, prev->log_level, NGX_LOG_ERR); |
428 | 430 |
429 return NGX_CONF_OK; | 431 return NGX_CONF_OK; |