From 5236d760cea563c9f335947a2e511f75815f626b Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Tue, 18 Aug 2020 23:26:40 +0000 Subject: [PATCH] Fix #79993: SplFileObject::flock has LOCK_NB as a valid operation git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350338 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/filesystem/functions/flock.xml | 4 ++-- reference/spl/splfileobject/flock.xml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/reference/filesystem/functions/flock.xml b/reference/filesystem/functions/flock.xml index 4bc5ff4ce5..7dc06c7641 100644 --- a/reference/filesystem/functions/flock.xml +++ b/reference/filesystem/functions/flock.xml @@ -67,8 +67,8 @@ It is also possible to add LOCK_NB as a bitmask to one - of the above operations if you don't want flock to - block while locking. + of the above operations, if flock should not + block during the locking attempt. diff --git a/reference/spl/splfileobject/flock.xml b/reference/spl/splfileobject/flock.xml index 453c57ba52..f3cd962771 100644 --- a/reference/spl/splfileobject/flock.xml +++ b/reference/spl/splfileobject/flock.xml @@ -44,13 +44,13 @@ LOCK_UN to release a lock (shared or exclusive). - - - LOCK_NB to not block while locking. - - + + It is also possible to add LOCK_NB as a bitmask to one + of the above operations, if flock should not + block during the locking attempt. +