johannes Mon, 25 Jan 2010 17:15:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=294003
Log:
merge r292632: remove automatic file unlocking on shutdown and/or stream close
(tony2001)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/NEWS
U php/php-src/branches/PHP_5_3_2/main/streams/plain_wrapper.c
Property changes on: php/php-src/branches/PHP_5_3_2
___________________________________________________________________
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292633-292634
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292634
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-25 17:14:58 UTC (rev 294002)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-25 17:15:41 UTC (rev 294003)
@@ -17,6 +17,9 @@
- Changed "post_max_size" php.ini directive to allow unlimited post size by
setting it to 0. (Rasmus)
+- Removed automatic file descriptor unlocking happening on shutdown and/or
+ stream close (on all OSes). (Tony, Ilia)
+
- Added INTERNALDATE support to imap_append. (nick at mailtrust dot com)
- Added support for SHA-256 and SHA-512 to php's crypt. (Pierre)
- Added realpath_cache_size() and realpath_cache_get() functions. (Stas)
Modified: php/php-src/branches/PHP_5_3_2/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3_2/main/streams/plain_wrapper.c 2010-01-25
17:14:58 UTC (rev 294002)
+++ php/php-src/branches/PHP_5_3_2/main/streams/plain_wrapper.c 2010-01-25
17:15:41 UTC (rev 294003)
@@ -387,9 +387,6 @@
#endif
if (close_handle) {
- if (data->lock_flag != LOCK_UN) {
- php_stream_lock(stream, LOCK_UN);
- }
if (data->file) {
if (data->is_process_pipe) {
errno = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
