fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-12 05:22:35 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix race condition when template file is being uploaded

Browse source
This commit is contained in:
Kijin Sung 2023-06-17 00:49:24 +09:00
parent 73e7e17347
commit ded3b97208
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
classes/template/TemplateHandler.class.php
View file

@ -161,13 +161,27 @@ class TemplateHandler
self::$rootTpl = $this->file; self::$rootTpl = $this->file;
} }
$latest_mtime = max(filemtime($this->file), $this->handler_mtime); // Don't try to compile files that are less than 1 second old
$filemtime = filemtime($this->file);
if ($filemtime > time() - 1)
{
$latest_mtime = $this->handler_mtime;
}
else
{
$latest_mtime = max($filemtime, $this->handler_mtime);
}
// make compiled file // make compiled file
if(!file_exists($this->compiled_file) || filemtime($this->compiled_file) < $latest_mtime) if(!file_exists($this->compiled_file) || filemtime($this->compiled_file) < $latest_mtime)
{ {
$buff = $this->parse(); $buff = $this->parse();
if(Rhymix\Framework\Storage::write($this->compiled_file, $buff) === false) if($buff === null && file_exists($this->compiled_file))
{
$error_message = 'Template compile failed: Source file is unreadable: ' . $this->file;
trigger_error($error_message, \E_USER_WARNING);
}
elseif(Rhymix\Framework\Storage::write($this->compiled_file, $buff) === false)
{ {
$tmpfilename = tempnam(sys_get_temp_dir(), 'rx-compiled'); $tmpfilename = tempnam(sys_get_temp_dir(), 'rx-compiled');
if($tmpfilename === false || Rhymix\Framework\Storage::write($tmpfilename, $buff) === false) if($tmpfilename === false || Rhymix\Framework\Storage::write($tmpfilename, $buff) === false)
@ -245,7 +259,11 @@ class TemplateHandler
} }
// read tpl file // read tpl file
$buff = FileHandler::readFile($this->file); $buff = Rhymix\Framework\Storage::read($this->file);
if ($buff === false)
{
return;
}
} }
// HTML tags to skip // HTML tags to skip