tony2001 Fri, 25 Dec 2009 20:34:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292632
Log:
remove automatic file unlocking on shutdown and/or stream close
(make it win32-specific for 5_2, as discussed with Ilia)
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/main/streams/plain_wrapper.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c
U php/php-src/trunk/main/streams/plain_wrapper.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-12-25 20:17:27 UTC (rev 292631)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-12-25 20:34:59 UTC (rev 292632)
@@ -3,7 +3,10 @@
?? ??? 2010, PHP 5.2.13
- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
(Ilia)
+- Removed automatic file descriptor unlocking happening on shutdown and/or
+ stream close (on all OSes excluding Windows). (Tony, Ilia)
+
- Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
- Fixed bug #50575 (PDO_PGSQL LOBs are not compatible with PostgreSQL 8.5).
Modified: php/php-src/branches/PHP_5_2/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_2/main/streams/plain_wrapper.c 2009-12-25
20:17:27 UTC (rev 292631)
+++ php/php-src/branches/PHP_5_2/main/streams/plain_wrapper.c 2009-12-25
20:34:59 UTC (rev 292632)
@@ -383,9 +383,11 @@
#endif
if (close_handle) {
+#ifdef PHP_WIN32
if (data->lock_flag != LOCK_UN) {
php_stream_lock(stream, LOCK_UN);
}
+#endif
if (data->file) {
if (data->is_process_pipe) {
errno = 0;
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-12-25 20:17:27 UTC (rev 292631)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-12-25 20:34:59 UTC (rev 292632)
@@ -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/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c 2009-12-25
20:17:27 UTC (rev 292631)
+++ php/php-src/branches/PHP_5_3/main/streams/plain_wrapper.c 2009-12-25
20:34:59 UTC (rev 292632)
@@ -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;
Modified: php/php-src/trunk/main/streams/plain_wrapper.c
===================================================================
--- php/php-src/trunk/main/streams/plain_wrapper.c 2009-12-25 20:17:27 UTC
(rev 292631)
+++ php/php-src/trunk/main/streams/plain_wrapper.c 2009-12-25 20:34:59 UTC
(rev 292632)
@@ -388,9 +388,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
