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 7ec8926a4573b74044f083cfaf01348ab3a00091..045bb7bd85586ecc4c89ea0ead71a387d3996b44 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ PHP                                                                        NEWS
 ?? ??? 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)
 

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