diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-25 20:34:59 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-25 20:34:59 +0000 |
| commit | 42d05a5c020929db37856d2076b5e1a3b51a62d5 (patch) | |
| tree | bf1bd3182817f210aa5c09749b5f245ff6c44e7b | |
| parent | 9326c7e3a2290864fa22f3a70f79ab471b2f9590 (diff) | |
| download | php-git-42d05a5c020929db37856d2076b5e1a3b51a62d5.tar.gz | |
remove automatic file unlocking on shutdown and/or stream close
(make it win32-specific for 5_2, as discussed with Ilia)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -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 6bf81e06ac..ce2f37095c 100644 --- 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; |