diff options
Diffstat (limited to 'main/main.c')
| -rw-r--r-- | main/main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/main.c b/main/main.c index c4b50ba84f..bffb89fb1c 100644 --- a/main/main.c +++ b/main/main.c @@ -835,12 +835,10 @@ static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path } /* }}} */ -#if wez_0 static void stream_closer_for_zend(void *handle TSRMLS_DC) { php_stream_close((php_stream*)handle); } -#endif static long stream_fteller_for_zend(void *handle TSRMLS_DC) { @@ -859,10 +857,7 @@ static int php_stream_open_for_zend(const char *filename, zend_file_handle *hand handle->free_filename = 0; handle->handle.stream.handle = stream; handle->handle.stream.reader = (zend_stream_reader_t)_php_stream_read; - /* don't set this; all streams are tracked as part of the resource system, - * and we'll end up double-free'ing them if we allow zend to close them - * down after the resource list has been cleaned up */ - handle->handle.stream.closer = NULL; /* stream_closer_for_zend; */ + handle->handle.stream.closer = stream_closer_for_zend; handle->handle.stream.fteller = stream_fteller_for_zend; handle->handle.stream.interactive = 0; /* suppress warning if this stream is not explicitly closed */ |