Changeset 2171

Timestamp:

05/15/2008 01:24:00 AM (2 months ago)

Author:

moo

Message:

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

Files:

• branches/lighttpd-1.4.x/src/configfile.c (modified) (2 diffs)

branches/lighttpd-1.4.x/src/configfile.c

@@ -409 +409 @@
-#if 0
-static int tokenizer_open(server *srv, tokenizer_t *t, buffer *basedir, const char *fn) {
-&&
-&&
+||
+||
-                        (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) {
-                t->file = buffer_init_string(fn);
@@ -883 +883 @@
-        buffer *filename;
-
-&&
-&&
+||
+||
-                        (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) {
-                filename = buffer_init_string(fn);