aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-10-01 19:37:22 +0200
committerdoktornotor <notordoktor@gmail.com>2015-10-01 19:37:22 +0200
commit781a2fa1be222ad4c4b2c32e293d4bd62ddf92b3 (patch)
tree49021e4e9b7cbea76faa5b7f09ab160ff8c42eeb
parent6fb1d579ee14eb39724b3c4650d5d4dba3e84220 (diff)
downloadpfsense-packages-781a2fa1be222ad4c4b2c32e293d4bd62ddf92b3.tar.gz
pfsense-packages-781a2fa1be222ad4c4b2c32e293d4bd62ddf92b3.tar.bz2
pfsense-packages-781a2fa1be222ad4c4b2c32e293d4bd62ddf92b3.zip
Fix the numdirs comparison here (int vs. string), make this more readable as well
Cache is getting always recreated because of strict comparison.
-rwxr-xr-xconfig/squid3/34/squid.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index d5fed4ce..fc957e34 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -166,7 +166,7 @@ function squid_dash_z($cache_action = 'none') {
// Re-create the cachedir if clean is forced by cronjob/manually,
// or if the cachedir changed, or level1_subdirs don't exist or the number of level1_subdirs changed
- if ($cache_action == "clean" || ((!is_dir($cachedir)) || (!is_dir($cachedir . '/00'))) || ($numdirs !== $currentdirs)) {
+ if ($cache_action == "clean" || !is_dir($cachedir) || !is_dir($cachedir . '/00') || $numdirs != $currentdirs) {
// cannot nuke disk cache while Squid is running
squid_stop_monitor();
if (is_service_running('squid')) {