remove automatic file unlocking on shutdown and/or stream close

(make it win32-specific for 5_2, as discussed with Ilia)

diff --git a/NEWS b/NEWS
index 184b773e97d13514f0bf306c793faeb91f68f7b6..2a1510aa3fe0e719de9ea0c261081e2364b52a94 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ PHP                                                                        NEWS
 - 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)

diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 6bf81e06ac1d54ab6e104fe815cae27ab0cb05ba..ce2f37095ca3d1e20412d6e83216e7c28ebdfa3c 100644 (file)
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -387,9 +387,6 @@ static int php_stdiop_close(php_stream *stream, int close_handle TSRMLS_DC)
 #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;