Skip to content

Commit d41920c

Browse files
committed
Use PHP_VERSION as OPcahce version
1 parent 2eb7e75 commit d41920c

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2934,7 +2934,7 @@ void accelerator_shm_read_unlock(void)
29342934

29352935
ZEND_EXT_API zend_extension zend_extension_entry = {
29362936
ACCELERATOR_PRODUCT_NAME, /* name */
2937-
ACCELERATOR_VERSION, /* version */
2937+
PHP_VERSION, /* version */
29382938
"Zend Technologies", /* author */
29392939
"http://www.zend.com/", /* URL */
29402940
"Copyright (c) 1999-2016", /* copyright */

ext/opcache/ZendAccelerator.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#endif
2828

2929
#define ACCELERATOR_PRODUCT_NAME "Zend OPcache"
30-
#define PHP_ZENDOPCACHE_VERSION "7.0.6-dev"
31-
#define ACCELERATOR_VERSION PHP_ZENDOPCACHE_VERSION
3230
/* 2 - added Profiler support, on 20010712 */
3331
/* 3 - added support for Optimizer's encoded-only-files mode */
3432
/* 4 - works with the new Optimizer, that supports the file format with licenses */

ext/opcache/zend_accelerator_module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ static zend_module_entry accel_module_entry = {
517517
NULL,
518518
NULL,
519519
zend_accel_info,
520-
ACCELERATOR_VERSION "FE",
520+
PHP_VERSION,
521521
NO_MODULE_GLOBALS,
522522
accel_post_deactivate,
523523
STANDARD_MODULE_PROPERTIES_EX
@@ -727,7 +727,7 @@ static ZEND_FUNCTION(opcache_get_configuration)
727727

728728
/*version */
729729
array_init(&version);
730-
add_assoc_string(&version, "version", ACCELERATOR_VERSION);
730+
add_assoc_string(&version, "version", PHP_VERSION);
731731
add_assoc_string(&version, "opcache_product_name", ACCELERATOR_PRODUCT_NAME);
732732
add_assoc_zval(return_value, "version", &version);
733733

0 commit comments

Comments
 (0)