Roxen.git/ server/ base_server/ configuration.pike

2005-11-28

2005-11-28 14:43:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 7723f05ae1e2b82c90e0f385c0fa88b9d0aa035c (20 lines) (+17/-3) ^{[ Show | Annotate ]}
  Branch: 5.2

Added optional extra argument to DataCache()->expire_entry().
Fixed set() and expire_entry().

Rev: server/base_server/configuration.pike:1.597

5:   // @appears Configuration   //! A site's main configuration    - constant cvs_version = "$Id: configuration.pike,v 1.596 2005/11/24 17:36:50 grubba Exp $"; + constant cvs_version = "$Id: configuration.pike,v 1.597 2005/11/28 14:43:32 grubba Exp $";   #include <module.h>   #include <module_constants.h>   #include <roxen.h>
254:    expire_entry( q[random(sizeof(q))] );    }    -  void expire_entry( string url ) +  void expire_entry(string url, string|void host)    { -  +  if (host_in_key) { +  url = (host|"") + "\0" + url; +  } else { +  // Forward compat in case host_in_key is enabled later... +  url = "\0" + url; +  }    if( cache[ url ] )    {    current_size -= strlen(cache[url][0]);
267:    string|void host)    {    if( strlen( data ) > max_file_size ) return; -  call_out( expire_entry, expire, url ); +  call_out(expire_entry, expire, url, host); +  +  if (host_in_key) { +  url = (host|"") + "\0" + url; +  } else { +  // Forward compat in case host_in_key is enabled later... +  url = "\0" + url; +  }    current_size += strlen( data );    cache[url] = ({ data, meta });    int n;