From: Marcus Boerger <helly@php.net>
Date: Sat, 3 Feb 2007 13:20:12 +0000 (+0000)
Subject: - Provide both version strings, api and ext
X-Git-Tag: RELEASE_1_0_0RC1~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b5b78ce18665f68bf4eedfd3a002fa1a701b6f2;p=php

- Provide both version strings, api and ext
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 989dbe2cae..dabae5d832 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1022,7 +1022,7 @@ int phar_open_or_create_filename(char *fname, int fname_len, char *alias, int al
 	mydata->fname_len = fname_len;
 	mydata->alias = alias ? estrndup(alias, alias_len) : mydata->fname;
 	mydata->alias_len = alias ? alias_len : fname_len;
-	snprintf(mydata->version, sizeof(mydata->version), "%s", PHAR_VERSION_STR);
+	snprintf(mydata->version, sizeof(mydata->version), "%s", PHAR_API_VERSION_STR);
 	mydata->is_explicit_alias = alias ? 1 : 0;
 	mydata->internal_file_start = -1;
 	mydata->fp = fp;
@@ -3088,7 +3088,8 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
-	php_info_print_table_row(2, "Phar API version", PHAR_VERSION_STR);
+	php_info_print_table_row(2, "Phar EXT version", PHAR_EXT_VERSION_STR);
+	php_info_print_table_row(2, "Phar API version", PHAR_API_VERSION_STR);
 	php_info_print_table_row(2, "CVS revision", "$Revision$");
 	php_info_print_table_row(2, "gzip compression", 
 #if HAVE_ZLIB
@@ -3134,7 +3135,7 @@ zend_module_entry phar_module_entry = {
 	PHP_RINIT(phar),
 	PHP_RSHUTDOWN(phar),
 	PHP_MINFO(phar),
-	PHAR_VERSION_STR,
+	PHAR_EXT_VERSION_STR,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index 5392438ab7..8ec79add34 100755
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -56,7 +56,8 @@
 #define E_RECOVERABLE_ERROR E_ERROR
 #endif
 
-#define PHAR_VERSION_STR          "1.0.0"
+#define PHAR_EXT_VERSION_STR      "1.0.0"
+#define PHAR_API_VERSION_STR      "1.0.0"
 /* x.y.z maps to 0xyz0 */
 #define PHAR_API_VERSION          0x1000
 #define PHAR_API_MIN_READ         0x1000
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 644fd36f36..0e7aa8d291 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -66,7 +66,7 @@ PHP_METHOD(Phar, loadPhar)
  * Returns the api version */
 PHP_METHOD(Phar, apiVersion)
 {
-	RETURN_STRINGL(PHAR_VERSION_STR, sizeof(PHAR_VERSION_STR)-1, 1);
+	RETURN_STRINGL(PHAR_API_VERSION_STR, sizeof(PHAR_API_VERSION_STR)-1, 1);
 }
 /* }}}*/