Branch: Tag:

2009-11-24

2009-11-24 15:11:21 by Henrik Grubbström (Grubba) <grubba@grubba.org>

ImageCache()->http_file_answer() now knows about ArgCache timeouts.
Added some ARG_CACHE_DEBUG.

Rev: server/base_server/roxen.pike:1.1050

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.1049 2009/11/24 13:01:03 grubba Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.1050 2009/11/24 15:11:21 grubba Exp $";      //! @appears roxen   //!
3152:    protected void|mapping draw( string name, RequestID id )    {   #ifdef ARG_CACHE_DEBUG -  werror("draw %O\n", name ); +  werror("draw: %O id: %O\n", name, id );   #endif    mixed args = Array.map( Array.map( name/"$", argcache->lookup,    id->client ), frommapp);
3162:    mapping meta;    string data;    array guides; + #ifdef ARG_CACHE_DEBUG +  werror("draw args: %O\n", args ); + #endif    mixed reply = draw_function( @copy_value(args), id );       if( !reply ) {
3916:       mapping http_file_answer( array|string|mapping data,    RequestID id, -  int|void nodraw ) +  int|void nodraw, int|void timeout )    //! Returns a @[result mapping] like one generated by    //! @[Roxen.http_file_answer()] but for the image file    //! rendered from the `data' instructions.
3927:    //! not found' error)    {    current_configuration->set(id->conf); -  string na = store( data,id ); +  string na = store( data, id, timeout );    mixed res;   #ifdef ARG_CACHE_DEBUG -  werror("data %O\n", na ); +  werror("data: %O id: %O\n", na, id );   #endif    if(! (res=restore( na,id )) )    {