better fix, revert unintentional commit to Makefile.frag

diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index f30ccfb80bc1757005897b2c822f7a2e5764e89e..3e79356fa1457f960fba9bdedcb39bfc6b6b8ab3 100755 (executable)
--- 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 233ca3f7c17dda4051ec25265173b590ea9363ca..b93e9368cb2e127f7330b30e45ff9823418918d5 100755 (executable)
--- 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);