[PHP-CVS] cvs: php-src /ext/standard file.c

[Jani Taskinen]

jani            Mon Sep  3 11:53:44 2007 UTC

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  MFB: Fixed bug #42468 (Write lock on file_get_contents fails when using a 
compression stream)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.498&r2=1.499&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.498 php-src/ext/standard/file.c:1.499
--- php-src/ext/standard/file.c:1.498   Mon Aug 13 08:14:03 2007
+++ php-src/ext/standard/file.c Mon Sep  3 11:53:43 2007
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.498 2007/08/13 08:14:03 jani Exp $ */
+/* $Id: file.c,v 1.499 2007/09/03 11:53:43 jani Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -661,7 +661,7 @@
                RETURN_FALSE;
        }
 
-       if (flags & LOCK_EX && php_stream_lock(stream, LOCK_EX)) {
+       if (flags & LOCK_EX && (!php_stream_supports_lock(stream) || 
php_stream_lock(stream, LOCK_EX))) {
                php_stream_close(stream);
                RETURN_FALSE;
        }

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