cvs: php-src(PHP_5_2) /ext/zlib zlib_fopen_wrapper.c

dmitry Thu Apr 26 12:52:58 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zlib zlib_fopen_wrapper.c Log: Prevent double close() of the same file handle http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_fopen_wrapper.c?r1=1.46.2.1.2.2&r2=1.46.2.1.2.3&diff_format=u Index: php-src/ext/zlib/zlib_fopen_wrapper.c diff -u php-src/ext/zlib/zlib_fopen_wrapper.c:1.46.2.1.2.2 php-src/ext/zlib/zlib_fopen_wrapper.c:1.46.2.1.2.3 --- php-src/ext/zlib/zlib_fopen_wrapper.c:1.46.2.1.2.2 Mon Jan 1 09:36:10 2007 +++ php-src/ext/zlib/zlib_fopen_wrapper.c Thu Apr 26 12:52:58 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.2 2007/01/01 09:36:10 sebastian Exp $ */ +/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.3 2007/04/26 12:52:58 dmitry Exp $ */ #define _GNU_SOURCE @@ -76,7 +76,7 @@ self->gz_file = NULL; } if (self->stream) { - php_stream_close(self->stream); + php_stream_free(self->stream, PHP_STREAM_FREE_CLOSE | PHP_STREAM_FREE_PRESERVE_HANDLE); self->stream = NULL; } }