Some cache fixes
This commit is contained in:
parent
fe549c1c05
commit
d3b97ae485
@ -82,7 +82,8 @@ if (isset($_SERVER['KOHANA_ENV']))
|
||||
Kohana::init(array(
|
||||
'base_url' => '/pta',
|
||||
'index_file' => '',
|
||||
'caching' => TRUE,
|
||||
'caching' => TRUE,
|
||||
'cache_dir' => '/dev/shm/lnapp',
|
||||
));
|
||||
|
||||
/**
|
||||
|
@ -193,6 +193,9 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
|
||||
}
|
||||
|
||||
parent::after();
|
||||
|
||||
// Generate and check the ETag for this file
|
||||
$this->response->check_cache(NULL,$this->request);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -240,9 +243,6 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
|
||||
* @return void
|
||||
*/
|
||||
final public function action_media() {
|
||||
// Generate and check the ETag for this file
|
||||
$this->response->check_cache(NULL,$this->request);
|
||||
|
||||
// Get the file path from the request
|
||||
$file = $this->request->param('file');
|
||||
|
||||
@ -272,6 +272,9 @@ abstract class Controller_lnApp_TemplateDefault extends Controller_Template {
|
||||
$this->response->status(404);
|
||||
}
|
||||
|
||||
// Generate and check the ETag for this file
|
||||
$this->response->check_cache(NULL,$this->request);
|
||||
|
||||
// Set the proper headers to allow caching
|
||||
$this->response->headers('Content-Type',File::mime_by_ext($ext));
|
||||
$this->response->headers('Content-Length',(string)$this->response->content_length());
|
||||
|
@ -18,7 +18,7 @@ class Controller_NODE extends Controller_TemplateDefault {
|
||||
$no = ORM::factory('node');
|
||||
$output = '';
|
||||
|
||||
$output .= sprintf(_('This server has <b>%s</b> defined nodes.'),$no->count_all());
|
||||
$output .= sprintf(_('This server has <b>%s</b> defined nodes.'),$no->cached(0)->count_all());
|
||||
$output .= '<br/>';
|
||||
$output .= '<br/>';
|
||||
|
||||
|
@ -16,7 +16,7 @@ return array
|
||||
'file' => array
|
||||
(
|
||||
'driver' => 'file',
|
||||
'cache_dir' => '/dev/shm/lnapp',
|
||||
'cache_dir' => Kohana::$cache_dir ? Kohana::$cache_dir : '/dev/shm/lnapp',
|
||||
'default_expire' => 3600,
|
||||
)
|
||||
);
|
||||
|
Reference in New Issue
Block a user