From: Greg Beaver <cellog@php.net>
Date: Fri, 14 Dec 2007 04:10:14 +0000 (+0000)
Subject: better fix, revert unintentional commit to Makefile.frag
X-Git-Tag: RELEASE_2_0_0a1~1181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c77090174df70d7fb73f5de55af83058b8fd432;p=php

better fix, revert unintentional commit to Makefile.frag
---

diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index f30ccfb80b..3e79356fa1 100755
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -20,6 +20,6 @@ $(builddir)/phar.phar: $(builddir)/phar.php $(srcdir)/phar/*.inc $(srcdir)/phar/
 		export PHP="$(top_builddir)/$(SAPI_CLI_PATH)"; \
 		export BANG="$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)"; \
 	fi; \
-	$$PHP -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c bz2 -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$$BANG"  $(srcdir)/phar/
+	$$PHP -d phar.readonly=0 $(srcdir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x CVS -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$$BANG"  $(srcdir)/phar/
 	@chmod +x $(builddir)/phar.phar
 
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 233ca3f7c1..b93e9368cb 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -340,7 +340,7 @@ static int phar_build(zend_object_iterator *iter, void *puser TSRMLS_DC)
 			break;
 		case IS_OBJECT :
 			if (instanceof_function(Z_OBJCE_PP(value), spl_ce_SplFileInfo TSRMLS_CC)) {
-				char *test;
+				char *test = NULL;
 				zval dummy;
 				spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(*value TSRMLS_CC);
 
@@ -357,7 +357,6 @@ static int phar_build(zend_object_iterator *iter, void *puser TSRMLS_DC)
 							efree(fname);
 							return ZEND_HASH_APPLY_KEEP;
 						}
-						test = NULL;
 						test = expand_filepath(fname, test TSRMLS_CC);
 						if (test) {
 							efree(fname);