Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_conf_file.c @ 454:a8424ffa495c NGINX_0_7_39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.39 *) Bugfix: large response with SSI might hang, if gzipping was enabled; the bug had appeared in 0.7.28. Thanks to Artem Bokhan. *) Bugfix: a segmentation fault might occur in worker process, if short static variants are used in a "try_files" directive.
author Igor Sysoev <http://sysoev.ru>
date Mon, 02 Mar 2009 00:00:00 +0300
parents 88d3e895bdf9
children 392c16f2d858
comparison
equal deleted inserted replaced
453:9ef0e36f3cd5 454:a8424ffa495c
739 value = cf->args->elts; 739 value = cf->args->elts;
740 file = value[1]; 740 file = value[1];
741 741
742 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); 742 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
743 743
744 if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR) { 744 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
745 return NGX_CONF_ERROR; 745 return NGX_CONF_ERROR;
746 } 746 }
747 747
748 if (strpbrk((char *) file.data, "*?[") == NULL) { 748 if (strpbrk((char *) file.data, "*?[") == NULL) {
749 749
852 #endif 852 #endif
853 853
854 if (name) { 854 if (name) {
855 full = *name; 855 full = *name;
856 856
857 if (ngx_conf_full_name(cycle, &full, 0) == NGX_ERROR) { 857 if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) {
858 return NULL; 858 return NULL;
859 } 859 }
860 860
861 part = &cycle->open_files.part; 861 part = &cycle->open_files.part;
862 file = part->elts; 862 file = part->elts;