Use PHP_VERSION as OPcahce version

diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index fab8975b9897fd1982aa4c7211df806b35bbf2e3..2cfe5390b393d55868e080b890a7fd59a0dac4d3 100644 (file)
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2934,7 +2934,7 @@ void accelerator_shm_read_unlock(void)
 
 ZEND_EXT_API zend_extension zend_extension_entry = {
        ACCELERATOR_PRODUCT_NAME,               /* name */
-       ACCELERATOR_VERSION,                                    /* version */
+       PHP_VERSION,                                                    /* version */
        "Zend Technologies",                                    /* author */
        "http://www.zend.com/",                                 /* URL */
        "Copyright (c) 1999-2016",                              /* copyright */

diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h
index f5d7af5bf63fb88b4455cd9026bee09c6b74eb86..4daadc7abe6262651886eca203ad831f83be2858 100644 (file)
--- a/ext/opcache/ZendAccelerator.h
+++ b/ext/opcache/ZendAccelerator.h
@@ -27,8 +27,6 @@
 #endif
 
 #define ACCELERATOR_PRODUCT_NAME       "Zend OPcache"
-#define PHP_ZENDOPCACHE_VERSION        "7.0.6-dev"
-#define ACCELERATOR_VERSION PHP_ZENDOPCACHE_VERSION
 /* 2 - added Profiler support, on 20010712 */
 /* 3 - added support for Optimizer's encoded-only-files mode */
 /* 4 - works with the new Optimizer, that supports the file format with licenses */

diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
index 219d25bf2fa0f319f2bc77d2d6c66e43616dc218..81dc6d6875845c0011cdfced989c21088e516c5f 100644 (file)
--- a/ext/opcache/zend_accelerator_module.c
+++ b/ext/opcache/zend_accelerator_module.c
@@ -517,7 +517,7 @@ static zend_module_entry accel_module_entry = {
        NULL,
        NULL,
        zend_accel_info,
-       ACCELERATOR_VERSION "FE",
+       PHP_VERSION,
        NO_MODULE_GLOBALS,
        accel_post_deactivate,
        STANDARD_MODULE_PROPERTIES_EX
@@ -727,7 +727,7 @@ static ZEND_FUNCTION(opcache_get_configuration)
 
        /*version */
        array_init(&version);
-       add_assoc_string(&version, "version", ACCELERATOR_VERSION);
+       add_assoc_string(&version, "version", PHP_VERSION);
        add_assoc_string(&version, "opcache_product_name", ACCELERATOR_PRODUCT_NAME);
        add_assoc_zval(return_value, "version", &version);