archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge from GitHub

Browse source
This commit is contained in:
Dmitry Stogov 2013-07-28 13:47:13 +04:00
parent bafe0e5399
commit ae5e70afac
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/opcache/ZendAccelerator.c
View file

@ -2163,7 +2163,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr)
case IS_CONSTANT_ARRAY: { case IS_CONSTANT_ARRAY: {
TSRMLS_FETCH(); TSRMLS_FETCH();
#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); GC_REMOVE_ZVAL_FROM_BUFFER(zvalue);
#endif
if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) { if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) {
/* break possible cycles */ /* break possible cycles */
Z_TYPE_P(zvalue) = IS_NULL; Z_TYPE_P(zvalue) = IS_NULL;
@ -2176,7 +2178,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr)
{ {
TSRMLS_FETCH(); TSRMLS_FETCH();
#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); GC_REMOVE_ZVAL_FROM_BUFFER(zvalue);
#endif
Z_OBJ_HT_P(zvalue)->del_ref(zvalue TSRMLS_CC); Z_OBJ_HT_P(zvalue)->del_ref(zvalue TSRMLS_CC);
} }
break; break;

2
ext/opcache/ZendAccelerator.h
View file

@ -27,7 +27,7 @@
#endif #endif
#define ACCELERATOR_PRODUCT_NAME "Zend OPcache" #define ACCELERATOR_PRODUCT_NAME "Zend OPcache"
#define ACCELERATOR_VERSION "7.0.2-dev" #define ACCELERATOR_VERSION "7.0.3-dev"
/* 2 - added Profiler support, on 20010712 */ /* 2 - added Profiler support, on 20010712 */
/* 3 - added support for Optimizer's encoded-only-files mode */ /* 3 - added support for Optimizer's encoded-only-files mode */
/* 4 - works with the new Optimizer, that supports the file format with licenses */ /* 4 - works with the new Optimizer, that supports the file format with licenses */