From 3234e78ca114b305f6eba9dc6783f9761a4850d8 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Tue, 12 Feb 2008 05:28:06 +0000 Subject: [PATCH] fix remaining broken tests broken by the addition of phar->fp closing --- ext/phar/phar.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index c255bdb3b42..8c6a5a1a047 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -214,9 +214,11 @@ int phar_archive_delref(phar_archive_data *phar TSRMLS_DC) /* {{{ */ } return 1; } else if (!phar->refcount) { - if (phar->fp) { + if (phar->fp && !(phar->flags & PHAR_FILE_COMPRESSION_MASK)) { /* close open file handle - allows removal or rename of - the file on windows, which has greedy locking */ + the file on windows, which has greedy locking + only close if the archive was not already compressed. If it + was compressed, then the fp does not refer to the original file */ php_stream_close(phar->fp); phar->fp = NULL; }