2005-12-05
2005-12-05 13:35:49 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
145592d432cd6765b27b18f75208d03bef98a8fe
(14 lines)
(+8/-6)
[
Show
| Annotate
]
Branch: 5.2
The protocol DataCache is now hierarchial, and utilizes the callbacks installed by id->register_vary_callback().
Rev: server/base_server/configuration.pike:1.598
Rev: server/protocols/http.pike:1.485
2:
// Modified by Francesco Chemolli to add throttling capabilities.
// Copyright © 1996 - 2004, Roxen IS.
- constant cvs_version = "$Id: http.pike,v 1.484 2005/11/28 16:21:40 grubba Exp $";
+ constant cvs_version = "$Id: http.pike,v 1.485 2005/12/05 13:35:49 grubba Exp $";
// #define REQUEST_DEBUG
#define MAGIC_ERROR
575: Inside #if undefined(DISABLE_SUPPORTS)
}
if ( client_var->charset && client_var->charset != "iso-8859-1" )
{
- misc->no_proto_cache = 1;
+ misc->no_proto_cache = 1; // FIXME: Why?
+
set_output_charset( client_var->charset );
input_charset = client_var->charset;
decode_charset_encoding( client_var->charset );
2105: Inside #if defined(RAM_CACHE)
file->stat[ST_MTIME]),
"rf":realfile,
]),
- misc->cacheable, misc->host);
+ misc->cacheable, this_object());
file = ([
"data":data,
"raw":file->raw,
2460: Inside #if defined(RAM_CACHE)
if( prot != "HTTP/0.9" &&
misc->cacheable &&
!misc->no_proto_cache &&
- (cv = conf->datacache->get(raw_url, misc->host)) )
+ (cv = conf->datacache->get(raw_url, this_object())) )
{
MY_TRACE_ENTER(sprintf("Found %O in ram cache - checking entry",
raw_url), 0);
if( !cv[1]->key ) {
MY_TRACE_LEAVE("Entry invalid due to zero key");
- conf->datacache->expire_entry(raw_url, misc->host);
+ conf->datacache->expire_entry(raw_url, this_object());
}
else
{
2504: Inside #if defined(RAM_CACHE)
if( !cv[1]->key )
{
MY_TRACE_LEAVE ("Entry invalid due to zero key");
- conf->datacache->expire_entry(raw_url, misc->host);
+ conf->datacache->expire_entry(raw_url, this_object());
can_cache = 0;
}
if( can_cache )