fixed a timing problem in JS-Minify

dreadkopp · Mar 12, 2021 · 29722dd · 29722dd
1 parent bfaa821
commit 29722dd
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/src/Handler/JSMinify.php b/src/Handler/JSMinify.php
@@ -47,8 +47,11 @@ public static function minify($buffer, $root_dir, $cache_dir, $inline_js, $publi
             return self::finalize($buffer, $inline_js, $public_cache_dir, $cachedAndOptimizedName, $js_version);
 
         }
-
-
+
+
+        if (file_exists($path)) {
+            unlink($path);
+        }
         // find js sources and collect
         $dom = new DOMDocument();
         @$dom->loadHTML($buffer);
@@ -71,14 +74,17 @@ public static function minify($buffer, $root_dir, $cache_dir, $inline_js, $publi
 
         }
 
-        if (file_exists($path)) {
-            unlink($path);
-        }
-        $fp = fopen($path, 'x');
-        if (fwrite($fp, $combined_js)) {
-            fclose($fp);
+
+        try {
+            $fp = fopen($path, 'x');
+            if (fwrite($fp, $combined_js)) {
+                fclose($fp);
+            }
+        } catch (\Exception $e) {
+            //prevent timing issues where file already exists due to multiple users accessing the page
         }
 
+
         return self::finalize($buffer, $inline_js, $public_cache_dir, $cachedAndOptimizedName, $js_version);
     }