diff --git a/ext/phar/package.php b/ext/phar/package.php index c054c4c7497..4a43eecddfb 100644 --- a/ext/phar/package.php +++ b/ext/phar/package.php @@ -23,6 +23,8 @@ Major feature functionality release * implement Phar::buildFromIterator(Iterator $it[, string $base_directory]) [Greg] * implement Phar::mount() for mounting external paths or files to locations inside a phar [Greg] * add Phar::delete() [Greg] + +Changes since 2.0.0a1: fix build in PHP 5.2 '; if (!class_exists("Phar") && !extension_loaded("Phar")) { diff --git a/ext/phar/package.xml b/ext/phar/package.xml index c0bfe67e883..116da934de2 100644 --- a/ext/phar/package.xml +++ b/ext/phar/package.xml @@ -29,10 +29,10 @@ avaiable then SHA-256 and SHA-512 signatures are supported as well.helly@php.net yes - 2008-03-26 - + 2008-03-27 + - 2.0.0a1 + 2.0.0a2 1.1.1 @@ -65,6 +65,8 @@ Major feature functionality release * implement Phar::mount() for mounting external paths or files to locations inside a phar [Greg] * add Phar::delete() [Greg] +Changes since 2.0.0a1: fix build in PHP 5.2 + @@ -527,14 +529,14 @@ Major feature functionality release - 2.0.0a1 + 2.0.0a2 1.1.1 alpha alpha - 2008-03-26 + 2008-03-27 PHP License @@ -561,8 +563,44 @@ Major feature functionality release * implement Phar::mount() for mounting external paths or files to locations inside a phar [Greg] * add Phar::delete() [Greg] +Changes since 2.0.0a1: fix build in PHP 5.2 + + + + 2.0.0a1 + 1.1.1 + + + alpha + alpha + + 2008-03-26 + PHP License + Major feature functionality release + * new default stub allows running of phar-based phars without phar extension [Greg/Steph] + * add support for tar-based and zip-based phar archives [Greg] + * add Phar::isTar(), Phar::isZip(), and Phar::isPhar() [Greg] + * add Phar::convertToTar(), Phar::convertToZip(), and Phar::convertToPhar() [Greg] + * add Phar::compress() [Greg] + * conversion to compressed or to other file formats automatically copies the archive + to a new extension (i.e. ".phar" to ".phar.tar" or ".tar" to ".tar.gz") [Steph] + * add Phar::webPhar() for running a web-based application unmodified + directly from a phar archive [Greg] + * file functions (fopen-based and stat-based) can be instructed to only look for + relative paths within a phar via Phar::interceptFileFuncs() + * add PharData class to allow manipulation/creation of non-executable tar and zip archives. [Steph] + non-executable tar/zip manipulation is allowed even when phar.readonly=1 [Greg] + * paths with . and .. work (phar://blah.phar/a/../b.php => phar://blah.phar/b.php) [Greg] + * add support for mkdir()/rmdir() and support for empty directories to phar file format [Greg] + * add option to compress the entire phar file for phar/tar file format [Greg] + * implement Phar::isCompressed() returning 0, Phar::GZ or Phar::BZ2 [Greg] + * implement Phar::copy(string $from, string $to) [Greg] + * implement Phar::buildFromIterator(Iterator $it[, string $base_directory]) [Greg] + * implement Phar::mount() for mounting external paths or files to locations inside a phar [Greg] + * add Phar::delete() [Greg] + 1.2.1 diff --git a/ext/phar/phar.c b/ext/phar/phar.c index a2fa0594db2..1d75019b7ec 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -2703,10 +2703,10 @@ int phar_zend_open(const char *filename, zend_file_handle *handle TSRMLS_DC) /* phar_archive_data *pphar = NULL; /* retrieving an include within the current directory, so use this if possible */ if (SUCCESS == (zend_hash_find(&(PHAR_GLOBALS->phar_fname_map), arch, arch_len, (void **) &pphar))) { - if (!(entry = phar_find_in_include_path(entry, entry_len, &phar TSRMLS_CC))) { + if (!(entry = phar_find_in_include_path(entry, entry_len, &pphar TSRMLS_CC))) { /* this file is not in the phar, use the original path */ if (SUCCESS == phar_orig_zend_open(filename, handle TSRMLS_CC)) { - if (SUCCESS == phar_mount_entry(phar, handle->opened_path ? handle->opened_path : (char *) filename, strlen(handle->opened_path ? handle->opened_path : filename), (char *) filename, strlen(filename) TSRMLS_CC)) { + if (SUCCESS == phar_mount_entry(pphar, handle->opened_path ? handle->opened_path : (char *) filename, strlen(handle->opened_path ? handle->opened_path : filename), (char *) filename, strlen(filename) TSRMLS_CC)) { if (handle->opened_path) { efree(handle->opened_path); } diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h index 8c88f085cd2..1f53fa66419 100644 --- a/ext/phar/php_phar.h +++ b/ext/phar/php_phar.h @@ -22,7 +22,7 @@ #ifndef PHP_PHAR_H #define PHP_PHAR_H -#define PHP_PHAR_VERSION "2.0.0a1" +#define PHP_PHAR_VERSION "2.0.0a2" #include "ext/standard/basic_functions.h" extern zend_module_entry phar_module_entry;