diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-05-17 17:17:09 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-05-17 17:17:09 +0300 |
| commit | 0d77222473bd25734134d63896e3d09b422f739d (patch) | |
| tree | 0ad3104b30a4b33cd893e1bb12d29210255e5b97 | |
| parent | b65b15c6f470cc3397ff7719d92cecc762c803e9 (diff) | |
| parent | d41920c57de652afc3794a56fd5bf8992575722f (diff) | |
| download | php-git-0d77222473bd25734134d63896e3d09b422f739d.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Use PHP_VERSION as OPcahce version
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 2 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_module.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 0c9ea47283..222935bad0 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2941,7 +2941,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 ffcb1b6eb6..48e0c1b4cc 100644 --- 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 aa01073c97..61698b4a9f 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -518,7 +518,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 @@ -728,7 +728,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); |