Roxen.git/ server/ base_server/ configuration.pike

1999-03-28

1999-03-28 21:23:01 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• cfda38bba1fefb85254d610c975e7f9494cf927e (30 lines) (+25/-5) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed typo in handle_request(): MODULE_FIRST now works again.
Fixed typo in find_dir(): Directory listings now work again.
Added some more REQUEST_DEBUG.

Rev: server/base_server/configuration.pike:1.180

1: - string cvs_version = "$Id: configuration.pike,v 1.179 1999/02/15 23:19:03 per Exp $"; + string cvs_version = "$Id: configuration.pike,v 1.180 1999/03/28 21:23:01 grubba Exp $";   #include <module.h>   #include <roxen.h>   
1633:    function funp;    mixed file;    -  if(roxen->find_site_for( id ) != this_object()) + #ifdef REQUEST_DEBUG +  werror("CONFIG: handle_request()\n"); + #endif /* REQUEST_DEBUG */ +  +  if(roxen->find_site_for( id ) != this_object()) { + #ifdef REQUEST_DEBUG +  werror("CONFIG: handle_request(): Redirected (1)\n"); + #endif /* REQUEST_DEBUG */    return id->conf->handle_request(id); -  +  }    foreach(first_modules(id), funp)    {    if(file = funp( id ))    break; -  if(id->conf != this_object) +  if(id->conf != this_object()) { + #ifdef REQUEST_DEBUG +  werror("CONFIG: handle_request(): Redirected (2)\n"); + #endif /* REQUEST_DEBUG */    return id->conf->handle_request(id);    } -  +  }       file = get_file(id);   
1649:    {    mixed ret;    foreach(last_modules(id), funp) if(ret = funp(id)) break; -  if (ret == 1) +  if (ret == 1) { + #ifdef REQUEST_DEBUG +  werror("CONFIG: handle_request(): Recurse\n"); + #endif /* REQUEST_DEBUG */    return handle_request(id); -  +  }    file = ret;    } -  + #ifdef REQUEST_DEBUG +  werror("CONFIG: handle_request(): Done\n"); + #endif /* REQUEST_DEBUG */    return file;   }   
1781:    }    if(sizeof(dir))    { -  TRACE_LEAVE(LOCALE->returning_list_files(sizeof(dir))); +  TRACE_LEAVE(LOCALE->returning_file_list(sizeof(dir)));    return dir;    }    TRACE_LEAVE(LOCALE->returning_no_dir());