fix memleak in external dirs

update package.xml
move API to 1.1.0
update package version to 1.1.0RC1
update API test

diff --git a/ext/phar/package.php b/ext/phar/package.php
index ab789032b82cda85b97cbdb924f65dcbd6086e2f..8620b693d7ea439ddaa45a446c04002d50653461 100644 (file)
--- a/ext/phar/package.php
+++ b/ext/phar/package.php
@@ -1,10 +1,14 @@
 <?php
 
-$notes = <<<EOT
-*BACKWARDS COMPATIBILITY BREAK*
-Rename Phar->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 df3b6df9603b6f7ce7f957fd0db7de6cc55ae23b..835580353f8cc907b2fc810ec94b6a4411e38f47 100644 (file)
--- 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.</description>
   <active>yes</active>
  </lead>
  <date>2007-03-26</date>
- <time>10:51:19</time>
+ <time>11:41:38</time>
  <version>
-  <release>1.0.0</release>
-  <api>1.0.0</api>
+  <release>1.1.0RC1</release>
+  <api>1.1.0</api>
  </version>
  <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license uri="http://www.php.net/license">PHP License</license>
  <notes>
-*BACKWARDS COMPATIBILITY BREAK*
-Rename Phar-&gt;begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering
-Note that isBuffering() returns the opposite value to isFlushingToPhar()
+
+ * implement ability connect a phar file &apos;phar://whatever&apos; 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]
+
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -194,6 +200,29 @@ Note that isBuffering() returns the opposite value to isFlushingToPhar()
  <providesextension>phar</providesextension>
  <extsrcrelease />
  <changelog>
+  <release>
+   <version>
+    <release>1.1.0RC1</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2007-03-26</date>
+   <license uri="http://www.php.net/license">PHP License</license>
+   <notes>
+
+ * implement ability connect a phar file &apos;phar://whatever&apos; 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]
+
+   </notes>
+  </release>
   <release>
    <version>
     <release>1.0.0</release>
@@ -205,11 +234,9 @@ Note that isBuffering() returns the opposite value to isFlushingToPhar()
    </stability>
    <date>2007-03-26</date>
    <license uri="http://www.php.net/license">PHP License</license>
-   <notes>
-*BACKWARDS COMPATIBILITY BREAK*
+   <notes>*BACKWARDS COMPATIBILITY BREAK*
 Rename Phar-&gt;begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering
-Note that isBuffering() returns the opposite value to isFlushingToPhar()
-   </notes>
+Note that isBuffering() returns the opposite value to isFlushingToPhar()</notes>
   </release>
  </changelog>
 </package>

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index df7bd2545165c3365ef9240f1d1055cdf8f107b7..12ad9aee7d0f809f60034ff18836c076055990b8 100644 (file)
--- 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 2a5c43e1f7ee24fd6a8e2a5dff78fc5d92ed665a..1b482aabc9fe12b011e9a10649e93938ffd23951 100755 (executable)
--- 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 61e9de455ee860b74a5ea83c1d922fb1bff5d024..397501e8e40b2dacc62a8dbe3e5626fae84a7850 100644 (file)
--- 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===