diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/nginx.h | 2 | ||||
-rw-r--r-- | src/core/ngx_file.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/nginx.h b/src/core/nginx.h index 91b6af221..ad8c76838 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.51" +#define NGINX_VER "nginx/0.3.52" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index c3c4592a7..0d094ec87 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -259,6 +259,10 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) path->name = value[1]; + if (path->name.data[path->name.len - 1] == '/') { + path->name.len--; + } + if (ngx_conf_full_name(cf->cycle, &path->name) == NGX_ERROR) { return NULL; } |