Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-03-03 21:40:06 +01:00
commit 310162fd1c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -73,7 +73,7 @@ class flock
// one file for writing simultaneously // one file for writing simultaneously
if (file_exists($this->path . '.lock')) if (file_exists($this->path . '.lock'))
{ {
$mode = 'rb'; $mode = 'rb+';
} }
else else
{ {
@ -89,7 +89,7 @@ class flock
// Two processes may attempt to create lock file at the same time. // Two processes may attempt to create lock file at the same time.
// Have the losing process try opening the lock file again for reading // Have the losing process try opening the lock file again for reading
// on the assumption that the winning process created it // on the assumption that the winning process created it
$mode = 'rb'; $mode = 'rb+';
$this->lock_fp = @fopen($this->path . '.lock', $mode); $this->lock_fp = @fopen($this->path . '.lock', $mode);
} }
else else