From f722b5f1c9d71542305f024c9769c9efb6793551 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 21 Feb 2020 21:52:00 -0500 Subject: [PATCH] Don't use file timestamp in cache filename Every file in the nix store has a timestamp of "1", meaning that the filename would remain constant even when changing zoneminder versions. This would mean that newer versions would use the existing symlink to an older version of the source file. We replace SRC_HASH in nix with a hash of the source used to build zoneminder to ensure this filename is unique. [peathot@hotmail.com: update for ZoneMinder 1.38.3] --- web/includes/functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 1b03a4ddd..5ba311691 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -1904,7 +1904,8 @@ function cache_bust($file) { $parts = pathinfo($file); global $css; $dirname = str_replace('/', '_', $parts['dirname']); - $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension']; + $srcHash = '@srcHash@'; + $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension']; if ( @symlink(ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile) or -- 2.53.0