iliaa Mon Sep 3 02:53:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard file.c
Log:
Fixed bug #42468 (Write lock on file_get_contents fails when using a
compression stream).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.923&r2=1.2027.2.547.2.924&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.923 php-src/NEWS:1.2027.2.547.2.924
--- php-src/NEWS:1.2027.2.547.2.923 Sat Sep 1 18:38:38 2007
+++ php-src/NEWS Mon Sep 3 02:53:56 2007
@@ -1,8 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 20??, PHP 5.2.5
-- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
- Upgraded PCRE to version 7.3 (Nuno)
+- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
- Fixed bug #42512 (ip2long('255.255.255.255') should return 4294967295 on
64-bit PHP). (Derick)
@@ -12,6 +12,8 @@
options). (Dmitry)
- Fixed bug #42452 (PDO classes do not expose Reflection API information).
(Hannes)
+- Fixed bug #42468 (Write lock on file_get_contents fails when using a
+ compression stream). (Ilia)
- Fixed bug #42359 (xsd:list type not parsed). (Dmitry)
- Fixed bug #42326 (SoapServer crash). (Dmitry)
- Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.26&r2=1.409.2.6.2.27&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.26
php-src/ext/standard/file.c:1.409.2.6.2.27
--- php-src/ext/standard/file.c:1.409.2.6.2.26 Sun Aug 12 17:09:59 2007
+++ php-src/ext/standard/file.c Mon Sep 3 02:53:56 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.409.2.6.2.26 2007/08/12 17:09:59 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.27 2007/09/03 02:53:56 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -610,7 +610,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
