Mercurial > hg > nginx
diff src/core/ngx_conf_file.c @ 2758:77264e0157ad
-p and --prefix=
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 27 Apr 2009 11:32:33 +0000 |
parents | d8316f307b6a |
children | d4a717592877 |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c Mon Apr 27 11:20:55 2009 +0000 +++ b/src/core/ngx_conf_file.c Mon Apr 27 11:32:33 2009 +0000 @@ -798,10 +798,6 @@ u_char *p, *prefix; ngx_str_t old; - if (name->data[0] == '/') { - return NGX_OK; - } - #if (NGX_WIN32) if (name->len > 2 @@ -812,17 +808,23 @@ return NGX_OK; } +#else + + if (name->data[0] == '/') { + return NGX_OK; + } + #endif old = *name; if (conf_prefix) { - len = sizeof(NGX_CONF_PREFIX) - 1; - prefix = (u_char *) NGX_CONF_PREFIX; + len = cycle->conf_prefix.len; + prefix = cycle->conf_prefix.data; } else { - len = cycle->root.len; - prefix = cycle->root.data; + len = cycle->prefix.len; + prefix = cycle->prefix.data; } name->len = len + old.len; @@ -851,7 +853,7 @@ full.data = NULL; #endif - if (name) { + if (name && name->len) { full = *name; if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) { @@ -887,7 +889,7 @@ return NULL; } - if (name) { + if (name && name->len) { file->fd = NGX_INVALID_FILE; file->name = full;