From bff63db577f5981f695bf2423f951f1b8a5bb3fa Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sun, 13 Apr 2003 19:47:55 +0000 Subject: [PATCH] Fix persistent stream closing (that one took me at least 3 days) --- main/streams/streams.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main/streams/streams.c b/main/streams/streams.c index d74cccf1ea..e925aac7e5 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -238,6 +238,11 @@ fprintf(stderr, "stream_alloc: %s:%p persistent=%s\n", ops->label, ret, persiste } /* }}} */ +int _php_stream_free_persistend(list_entry *le, void *pStream TSRMLS_DC) +{ + return le->ptr == pStream; +} + PHPAPI int _php_stream_free(php_stream *stream, int close_options TSRMLS_DC) /* {{{ */ { int ret = 1; @@ -364,6 +369,10 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov #else pefree(stream, stream->is_persistent); #endif + if (stream->is_persistent) { + /* we don't work with *stream but need its value for comparison */ + zend_hash_apply_with_argument(&EG(persistent_list), (apply_func_arg_t) _php_stream_free_persistend, stream TSRMLS_CC); + } } return ret; -- 2.50.1