merge r292632: remove automatic file unlocking on shutdown and/or stream close

(tony2001)

diff --git a/NEWS b/NEWS
index c202b7f1b3aabe0cfe28405749889a6bdc12753e..e2a7a52c5d16dc4788e6918c6beb76ff1ce2276a 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 b857f2c3418886e54d1cb9ca4368bbc5ee954213..1c415b22325899400075b03933e574e719deb326 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;