comparison src/http/modules/ngx_http_limit_conn_module.c @ 656:9d21dad0b5a1 NGINX_1_1_12

nginx 1.1.12 *) Change: a "proxy_pass" directive without URI part now uses changed URI after redirection with the "error_page" directive; Thanks to Lanshun Zhou. *) Feature: the "proxy/fastcgi/scgi/uwsgi_cache_lock", "proxy/fastcgi/scgi/uwsgi_cache_lock_timeout" directives. *) Feature: the "pcre_jit" directive. *) Feature: the "if" SSI command supports captures in regular expressions. *) Bugfix: the "if" SSI command did not work inside the "block" command. *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level" directives might not work. *) 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: a "proxy_pass" directive without URI part always used original request URI if variables were used. *) Bugfix: a "proxy_pass" directive without URI part might use original request after redirection with the "try_files" directive; Thanks to Lanshun Zhou. *) Bugfix: in the ngx_http_scgi_module. *) Bugfix: in the ngx_http_mp4_module. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.1.9.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 Dec 2011 00:00:00 +0400
parents f200748c0ac8
children d0f7a625f27c
comparison
equal deleted inserted replaced
655:189afff6503f 656:9d21dad0b5a1
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;