summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-07-12 17:55:38 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-07-12 17:55:38 +0000
commitfa4ea0fff4873821c30f434c0c9a85ba588d59be (patch)
tree27a3f2b6c90e30020147320e60bbe42af6fba4fc
parent0131b2b032501017e9a9ad314bdf77c587a7afd0 (diff)
downloadphp-git-fa4ea0fff4873821c30f434c0c9a85ba588d59be.tar.gz
Added support for LOCK_EX flag for file_put_contents().
-rw-r--r--NEWS1
-rw-r--r--ext/standard/file.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 4dc581bc81..a89e8f2299 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PHP NEWS
functions will use. (Derick)
- Added pg_fetch_all_columns() function to fetch all values of a column from
a result cursor. (Ilia)
+- Added support for LOCK_EX flag for file_put_contents(). (Ilia)
- Implemented feature request #33452 (Year belonging to ISO week). (Derick)
- Fixed support for shared extensions on AIX. (Dmitry)
- Fixed memory corruption in pg_copy_from() in case the as_null parameter was
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 349b27bab7..cbb825198c 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -584,6 +584,11 @@ PHP_FUNCTION(file_put_contents)
if (stream == NULL) {
RETURN_FALSE;
}
+
+ if (flags & LOCK_EX && php_stream_lock(stream, LOCK_EX)) {
+ RETURN_FALSE;
+ }
+
switch (Z_TYPE_P(data)) {
case IS_RESOURCE:
{