Mercurial > hg > nginx-vendor-1-0
comparison src/core/ngx_conf_file.c @ 366:babd3d9efb62 NGINX_0_6_27
nginx 0.6.27
*) Change: now by default the rtsig method is not built on
Linux 2.6.18+.
*) Change: now a request method is not changed while redirection to a
named location via an "error_page" directive.
*) Feature: the "resolver" and "resolver_timeout" directives in SMTP
proxy.
*) Feature: the "post_action" directive supports named locations.
*) Bugfix: a segmentation fault occurred in worker process, if a
request was redirected from proxy, FastCGI, or memcached location to
static named locations.
*) Bugfix: browsers did not repeat SSL handshake if there is no valid
client certificate in first handshake.
Thanks to Alexander V. Inyukhin.
*) Bugfix: if response code 495-497 was redirected via an "error_page"
directive without code change, then nginx tried to allocate too many
memory.
*) Bugfix: memory leak in long-lived non buffered connections.
*) Bugfix: memory leak in resolver.
*) Bugfix: a segmentation fault occurred in worker process, if a
request was redirected from proxy, FastCGI, or memcached location to
static named locations.
*) Bugfix: in the $proxy_host and $proxy_port variables caching.
Thanks to Sergey Bochenkov.
*) Bugfix: a "proxy_pass" directive with variables used incorrectly the
same port as in another "proxy_pass" directive with the same host
name and without variables.
Thanks to Sergey Bochenkov.
*) Bugfix: an alert "sendmsg() failed (9: Bad file descriptor)" on some
64-bit platforms while reconfiguration.
*) Bugfix: a segmentation fault occurred in worker process, if empty
stub block was used second time in SSI.
*) Bugfix: in copying URI part contained escaped symbols into arguments.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 12 Mar 2008 00:00:00 +0300 |
parents | b743d290eb3b |
children | 6639b93e81b2 |
comparison
equal
deleted
inserted
replaced
365:9b0140fa1132 | 366:babd3d9efb62 |
---|---|
631 static char * | 631 static char * |
632 ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | 632 ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
633 { | 633 { |
634 char *rv; | 634 char *rv; |
635 ngx_int_t n; | 635 ngx_int_t n; |
636 ngx_str_t *value, file; | 636 ngx_str_t *value, file, name; |
637 ngx_glob_t gl; | 637 ngx_glob_t gl; |
638 | 638 |
639 value = cf->args->elts; | 639 value = cf->args->elts; |
640 file = value[1]; | 640 file = value[1]; |
641 | 641 |
657 } | 657 } |
658 | 658 |
659 rv = NGX_CONF_OK; | 659 rv = NGX_CONF_OK; |
660 | 660 |
661 for ( ;; ) { | 661 for ( ;; ) { |
662 n = ngx_read_glob(&gl, &file); | 662 n = ngx_read_glob(&gl, &name); |
663 | 663 |
664 if (n != NGX_OK) { | 664 if (n != NGX_OK) { |
665 break; | 665 break; |
666 } | 666 } |
667 | |
668 file.len = name.len++; | |
669 file.data = ngx_pstrdup(cf->pool, &name); | |
667 | 670 |
668 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); | 671 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); |
669 | 672 |
670 rv = ngx_conf_parse(cf, &file); | 673 rv = ngx_conf_parse(cf, &file); |
671 | 674 |