bug #46012 [HttpKernel] Fix Symfony not working on SMB share (qinshuze)

nicolas-grekas · nicolas-grekas · commit 76f6d740cb68 · 2022-04-12T13:34:13.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] Fix Symfony not working on SMB share | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #45990 | License | MIT | Doc PR | - Commits ------- 1ff7ebc Fix Symfony not working on SMB share #45990
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -528,9 +528,7 @@ protected function initializeContainer()
             is_dir($cacheDir) ?: mkdir($cacheDir, 0777, true);
 
             if ($lock = fopen($cachePath.'.lock', 'w')) {
-                flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock);
-
-                if (!flock($lock, $wouldBlock ? \LOCK_SH : \LOCK_EX)) {
+                if (!flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock) && !flock($lock, $wouldBlock ? \LOCK_SH : \LOCK_EX)) {
                     fclose($lock);
                     $lock = null;
                 } elseif (!is_file($cachePath) || !\is_object($this->container = include $cachePath)) {
