Skip to content

Commit

Permalink
Merge branch 'PHP-5.5' into PHP-5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@laruence
laruence committed May 5, 2015
2 parents 7289981 + cf3e976 commit 24992a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ext/opcache/ZendAccelerator.h
View file
Expand Up @@ -27,7 +27,7 @@
#endif

#define ACCELERATOR_PRODUCT_NAME "Zend OPcache"
#define PHP_ZENDOPCACHE_VERSION "7.0.4-dev"
#define PHP_ZENDOPCACHE_VERSION "7.0.6-dev"

This comment has been minimized.

Sign in to view

Copy link
@Jan-E

Jan-E May 15, 2015

Contributor

@laruence
Why is not this change reflected in the 5.6.9 branch? The 5.6.9 branch differs from the 5.6 branch in this respect:
https://github.com/php/php-src/blob/PHP-5.6/ext/opcache/ZendAccelerator.h#L30
https://github.com/php/php-src/blob/PHP-5.6.9/ext/opcache/ZendAccelerator.h#L30
This raises questions if other changes in the 5.6 branch did not make it to 5.6.9.

This comment has been minimized.

Sign in to view

Copy link
@laruence

laruence May 15, 2015

Author Member

I assume it should be done by RM

This comment has been minimized.

Sign in to view

Copy link
@Jan-E

Jan-E May 15, 2015

Contributor

Maybe it is because the change was made after 5.6.9RC1 has been created. The question is: will 5.6.10RC1 be a clone of the general 5.6 branch? In that case it will eventually be shown in 5.6.10RC1 and 5.6.10.
#define ACCELERATOR_VERSION PHP_ZENDOPCACHE_VERSION
/* 2 - added Profiler support, on 20010712 */
/* 3 - added support for Optimizer's encoded-only-files mode */
Expand Down

0 comments on commit 24992a1

Please sign in to comment.