Browse Source

merged [2170] from trunk: fixed include basedir within include_shell, thanks to lunatic

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2171 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.20
Xuefer 14 years ago
parent
commit
098ea27629
  1. 8
      src/configfile.c

8
src/configfile.c

@ -408,8 +408,8 @@ typedef struct {
#if 0
static int tokenizer_open(server *srv, tokenizer_t *t, buffer *basedir, const char *fn) {
if (buffer_is_empty(basedir) &&
(fn[0] == '/' || fn[0] == '\\') &&
if (buffer_is_empty(basedir) ||
(fn[0] == '/' || fn[0] == '\\') ||
(fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) {
t->file = buffer_init_string(fn);
} else {
@ -882,8 +882,8 @@ int config_parse_file(server *srv, config_t *context, const char *fn) {
int ret;
buffer *filename;
if (buffer_is_empty(context->basedir) &&
(fn[0] == '/' || fn[0] == '\\') &&
if (buffer_is_empty(context->basedir) ||
(fn[0] == '/' || fn[0] == '\\') ||
(fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) {
filename = buffer_init_string(fn);
} else {

Loading…
Cancel
Save