Branch: Tag:

2004-04-20

2004-04-20 14:06:45 by Henrik Grubbström (Grubba) <grubba@grubba.org>

get_file() is now more aware of low_get_file() being able to return -1 in no_magic mode.

Rev: server/base_server/configuration.pike:1.556

5:   // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.555 2004/04/19 16:44:57 mast Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.556 2004/04/20 14:06:45 grubba Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
1803:    return file;   }    - mapping get_file(RequestID id, int|void no_magic, int|void internal_get) + mapping|int get_file(RequestID id, int|void no_magic, int|void internal_get)   //! Return a result mapping for the id object at hand, mapping all   //! modules, including the filter modules. This function is mostly a   //! wrapper for <ref>low_get_file()</ref>.
1832:    PROF_ENTER(Roxen.get_owning_module(tmp)->module_name,"filter");    if(res2=tmp(res,id))    { -  if(res && res->file && (res2->file != res->file)) +  if(mappinp(res) && res->file && (res2->file != res->file))    destruct(res->file);    TRACE_LEAVE("Rewrote result.");    res=res2;