Changeset 2171 for branches

Show
Ignore:
Timestamp:
05/15/2008 01:24:00 AM (5 months ago)
Author:
moo
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r2161 r2171  
    409409#if 0 
    410410static int tokenizer_open(server *srv, tokenizer_t *t, buffer *basedir, const char *fn) { 
    411         if (buffer_is_empty(basedir) && 
    412                         (fn[0] == '/' || fn[0] == '\\') && 
     411        if (buffer_is_empty(basedir) || 
     412                        (fn[0] == '/' || fn[0] == '\\') || 
    413413                        (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) { 
    414414                t->file = buffer_init_string(fn); 
    … …  
    883883        buffer *filename; 
    884884 
    885         if (buffer_is_empty(context->basedir) && 
    886                         (fn[0] == '/' || fn[0] == '\\') && 
     885        if (buffer_is_empty(context->basedir) || 
     886                        (fn[0] == '/' || fn[0] == '\\') || 
    887887                        (fn[0] == '.' && (fn[1] == '/' || fn[1] == '\\'))) { 
    888888                filename = buffer_init_string(fn);