iliaa           Tue Jul 12 13:55:39 2005 EDT

  Modified files:              
    /php-src    NEWS 
    /php-src/ext/standard       file.c 
  Log:
  Added support for LOCK_EX flag for file_put_contents().
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1992&r2=1.1993&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1992 php-src/NEWS:1.1993
--- php-src/NEWS:1.1992 Tue Jul 12 02:52:57 2005
+++ php-src/NEWS        Tue Jul 12 13:55:35 2005
@@ -10,6 +10,7 @@
   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
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.407&r2=1.408&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.407 php-src/ext/standard/file.c:1.408
--- php-src/ext/standard/file.c:1.407   Wed Jun 22 12:13:47 2005
+++ php-src/ext/standard/file.c Tue Jul 12 13:55:38 2005
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.407 2005/06/22 16:13:47 iliaa Exp $ */
+/* $Id: file.c,v 1.408 2005/07/12 17:55:38 iliaa Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -584,6 +584,11 @@
        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:
                {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to