Mercurial > hg > nginx-vendor-current

diff src/core/ngx_file.c @ 30:e1ada20fc595 NGINX_0_1_15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.15 *) Bugfix: the error while the connecting to the FastCGI server caused segmentation fault. *) Bugfix: the correct handling of the regular expression, that has different number of the captures and substitutions. *) Feature: the location, that is passed to the FastCGI server, can be regular expression. *) Bugfix: the FastCGI's parameter REQUEST_URI is now passed with the arguments and in the original state. *) Bugfix: the ngx_http_rewrite_module module was required to be built to use the regular expressions in locations. *) Bugfix: the directive "proxy_preserve_host on" adds port 80 to the "Host" headers, if upstream listen on port 80; bug appeared in 0.1.14. *) Bugfix: the same paths in autoconfiguration parameters --http-client-body-temp-path=PATH and --http-proxy-temp-path=PATH, or --http-client-body-temp-path=PATH and --http-fastcgi-temp-path=PATH caused segmentation fault.
author Igor Sysoev <http://sysoev.ru>
date Wed, 19 Jan 2005 00:00:00 +0300
parents 7ca9bdc82b3f
children 41ccba1aba45
line wrap: on
line diff
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -252,9 +252,19 @@ ngx_int_t ngx_add_path(ngx_conf_t *cf, n
             for (n = 0; n < 3; n++) {
                 if (p[i]->level[n] != path->level[n]) {
                     if (path->conf_file == NULL) {
+                        if (p[i]->conf_file == NULL) {
+                            ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+                                      "the default path name \"%V\" has "
+                                      "the same name as another default path, "
+                                      "but the different levels, you need to "
+                                      "redefine one of them in http section",
+                                      &p[i]->name);
+                            return NGX_ERROR;
+                        }
+
                         ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
                                       "the path name \"%V\" in %s:%ui has "
-                                      "the same name as default path but "
+                                      "the same name as default path, but "
                                       "the different levels, you need to "
                                       "define default path in http section",
                                       &p[i]->name, p[i]->conf_file, p[i]->line);