From 5ef0a901841a18e82f30078403fa332776071c6c Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 25 Dec 2009 20:34:59 +0000 Subject: [PATCH] remove automatic file unlocking on shutdown and/or stream close (make it win32-specific for 5_2, as discussed with Ilia) --- NEWS | 3 +++ main/streams/plain_wrapper.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 7ec8926a45..045bb7bd85 100644 --- 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 8020731258..dd65417081 100644 --- 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; -- 2.50.1