- 5_2 compatibility stuff (so we can stay in sync with PECL)

diff --git a/ext/phar/util.c b/ext/phar/util.c
index 8f39cd61abdd674ed4ced14ef8deba884fe3859d..043aad7b147fe42047a7e258218a07d0f9a0ae33 100644 (file)
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -336,7 +336,7 @@ splitted:
 
        efree(entry);
        if (*filename == '.') {
-               phar_archive_data **pphar;
+               phar_archive_data **pphar = NULL;
                int try_len;
 
                if (FAILURE == phar_get_archive(pphar, arch, arch_len, NULL, 0, NULL TSRMLS_CC)) {

diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 1651580fe7f82017c79c6b7526c34ff6576f7b4a..636360b90f8b1801fa49ea0121200a95cb343102 100644 (file)
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -213,11 +213,15 @@ int phar_parse_zipfile(php_stream *fp, char *fname, int fname_len, char *alias,
                                if (phar_parse_metadata(&metadata, &mydata->metadata, PHAR_GET_16(locator.comment_len) TSRMLS_CC) == FAILURE) {
                                        mydata->metadata_len = 0;
                                        /* if not valid serialized data, it is a regular string */
+#if PHP_VERSION_ID >= 50300
                                        if (entry.is_persistent) {
                                                ALLOC_PERMANENT_ZVAL(mydata->metadata);
                                        } else {
                                                ALLOC_ZVAL(mydata->metadata);
                                        }
+#else
+                                       ALLOC_ZVAL(mydata->metadata);
+#endif
                                        INIT_ZVAL(*mydata->metadata);
                                        metadata = pestrndup(metadata, PHAR_GET_16(locator.comment_len), mydata->is_persistent);
                                        ZVAL_STRINGL(mydata->metadata, metadata, PHAR_GET_16(locator.comment_len), 0);
@@ -405,11 +409,15 @@ foundit:
                        if (phar_parse_metadata(&p, &(entry.metadata), PHAR_GET_16(zipentry.comment_len) TSRMLS_CC) == FAILURE) {
                                entry.metadata_len = 0;
                                /* if not valid serialized data, it is a regular string */
+#if PHP_VERSION_ID >= 50300
                                if (entry.is_persistent) {
                                        ALLOC_PERMANENT_ZVAL(entry.metadata);
                                } else {
                                        ALLOC_ZVAL(entry.metadata);
                                }
+#else
+                               ALLOC_ZVAL(entry.metadata);
+#endif
                                INIT_ZVAL(*entry.metadata);
                                ZVAL_STRINGL(entry.metadata, pestrndup(buf, PHAR_GET_16(zipentry.comment_len), entry.is_persistent), PHAR_GET_16(zipentry.comment_len), 0);
                        }