Merge branch '2.8' into 3.4
* 2.8: [Filesystem] fix lock file permissions add @xabbuh as a code owner of the Yaml component
This commit is contained in:
commit
69509728c4
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -25,3 +25,5 @@
|
|||||||
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
|
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
|
||||||
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
|
/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
|
||||||
/src/Symfony/Component/Workflow/* @lyrixx
|
/src/Symfony/Component/Workflow/* @lyrixx
|
||||||
|
# Yaml
|
||||||
|
/src/Symfony/Component/Yaml/* @xabbuh
|
||||||
|
@ -83,7 +83,7 @@ class LockHandler
|
|||||||
|
|
||||||
if (!$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r')) {
|
if (!$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r')) {
|
||||||
if ($this->handle = fopen($this->file, 'x')) {
|
if ($this->handle = fopen($this->file, 'x')) {
|
||||||
chmod($this->file, 0444);
|
chmod($this->file, 0644);
|
||||||
} elseif (!$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r')) {
|
} elseif (!$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r')) {
|
||||||
usleep(100); // Give some time for chmod() to complete
|
usleep(100); // Give some time for chmod() to complete
|
||||||
$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r');
|
$this->handle = fopen($this->file, 'r+') ?: fopen($this->file, 'r');
|
||||||
|
Reference in New Issue
Block a user