From e97b1aefbf6c0f30f2bea8284a26a20c8502a0fb Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Mon, 26 Mar 2007 16:42:47 +0000 Subject: [PATCH] fix memleak in external dirs update package.xml move API to 1.1.0 update package version to 1.1.0RC1 update API test --- ext/phar/package.php | 18 ++++++++------ ext/phar/package.xml | 51 ++++++++++++++++++++++++++++++---------- ext/phar/phar.c | 1 + ext/phar/phar_internal.h | 6 ++--- ext/phar/tests/001.phpt | 2 +- 5 files changed, 55 insertions(+), 23 deletions(-) diff --git a/ext/phar/package.php b/ext/phar/package.php index ab789032b8..8620b693d7 100644 --- a/ext/phar/package.php +++ b/ext/phar/package.php @@ -1,10 +1,14 @@ begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering -Note that isBuffering() returns the opposite value to isFlushingToPhar() -EOT; +$notes = ' + * implement ability connect a phar file \'phar://whatever\' to a directory. That way all + access to that phar archive are directed to the extracted directory. This + allows to have the installed files and the archieve keep the same includes. + [Marcus] + * implement SHA-2 (256, 512) support [Marcus] + * implement setSignatureAlgorithm() and Phar::MD5 Phar::SHA1 Phar::SHA256 Phar::SHA512 Phar::PGP to + choose the kind of signature to use (PGP falls back to SHA1) [Greg] +'; if (!class_exists("Phar") && !extension_loaded("Phar")) { die("Extension phar not present"); @@ -53,8 +57,8 @@ $package->setPackageType('extsrc'); $package->addRelease(); $package->setReleaseVersion(phpversion('phar')); $package->setAPIVersion(Phar::apiVersion()); -$package->setReleaseStability('stable'); -$package->setAPIStability('stable'); +$package->setReleaseStability('beta'); +$package->setAPIStability('beta'); $package->setNotes("\n$notes\n"); //$package->addGlobalReplacement('package-info', '@package_version@', 'version'); $package->generateContents(); diff --git a/ext/phar/package.xml b/ext/phar/package.xml index df3b6df960..835580353f 100644 --- a/ext/phar/package.xml +++ b/ext/phar/package.xml @@ -29,20 +29,26 @@ if the ini variable phar.require_hash is set to true. yes 2007-03-26 - + - 1.0.0 - 1.0.0 + 1.1.0RC1 + 1.1.0 - stable - stable + beta + beta PHP License -*BACKWARDS COMPATIBILITY BREAK* -Rename Phar->begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering -Note that isBuffering() returns the opposite value to isFlushingToPhar() + + * implement ability connect a phar file 'phar://whatever' to a directory. That way all + access to that phar archive are directed to the extracted directory. This + allows to have the installed files and the archieve keep the same includes. + [Marcus] + * implement SHA-2 (256, 512) support [Marcus] + * implement setSignatureAlgorithm() and Phar::MD5 Phar::SHA1 Phar::SHA256 Phar::SHA512 Phar::PGP to + choose the kind of signature to use (PGP falls back to SHA1) [Greg] + @@ -194,6 +200,29 @@ Note that isBuffering() returns the opposite value to isFlushingToPhar() phar + + + 1.1.0RC1 + 1.1.0 + + + beta + beta + + 2007-03-26 + PHP License + + + * implement ability connect a phar file 'phar://whatever' to a directory. That way all + access to that phar archive are directed to the extracted directory. This + allows to have the installed files and the archieve keep the same includes. + [Marcus] + * implement SHA-2 (256, 512) support [Marcus] + * implement setSignatureAlgorithm() and Phar::MD5 Phar::SHA1 Phar::SHA256 Phar::SHA512 Phar::PGP to + choose the kind of signature to use (PGP falls back to SHA1) [Greg] + + + 1.0.0 @@ -205,11 +234,9 @@ Note that isBuffering() returns the opposite value to isFlushingToPhar() 2007-03-26 PHP License - -*BACKWARDS COMPATIBILITY BREAK* + *BACKWARDS COMPATIBILITY BREAK* Rename Phar->begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering -Note that isBuffering() returns the opposite value to isFlushingToPhar() - +Note that isBuffering() returns the opposite value to isFlushingToPhar() diff --git a/ext/phar/phar.c b/ext/phar/phar.c index df7bd25451..12ad9aee7d 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1653,6 +1653,7 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, char *pat if (!fp) { php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: file \"%s\" extracted from \"%s\" could not be opened", internal_file, resource->host); } + php_url_free(resource); efree(internal_file); return fp; } diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 2a5c43e1f7..1b482aabc9 100755 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -62,10 +62,10 @@ #define E_RECOVERABLE_ERROR E_ERROR #endif -#define PHAR_EXT_VERSION_STR "1.0.0" -#define PHAR_API_VERSION_STR "1.0.0" +#define PHAR_EXT_VERSION_STR "1.1.0RC1" +#define PHAR_API_VERSION_STR "1.1.0" /* x.y.z maps to 0xyz0 */ -#define PHAR_API_VERSION 0x1000 +#define PHAR_API_VERSION 0x1100 #define PHAR_API_MIN_READ 0x1000 #define PHAR_API_MAJORVERSION 0x1000 #define PHAR_API_MAJORVER_MASK 0xF000 diff --git a/ext/phar/tests/001.phpt b/ext/phar/tests/001.phpt index 61e9de455e..397501e8e4 100644 --- a/ext/phar/tests/001.phpt +++ b/ext/phar/tests/001.phpt @@ -8,5 +8,5 @@ var_dump(Phar::apiVersion()); ?> ===DONE=== --EXPECT-- -string(5) "1.0.0" +string(5) "1.1.0" ===DONE=== -- 2.40.0