diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-07-28 13:50:13 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-07-28 13:50:13 +0400 |
| commit | 294335761b75d13d374312d9074d1f9270f69267 (patch) | |
| tree | e3b4569e3ff4996a3bdfc7ffaee8df1959679efa | |
| parent | d4aee1021e6a29f62dcb9c96e945a0fe710c8832 (diff) | |
| parent | ae5e70afac265e6b113d7995bb10479ee2565aba (diff) | |
| download | php-git-294335761b75d13d374312d9074d1f9270f69267.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Merge from GitHub
Update NEWS
Fixed bug #65336
Conflicts:
NEWS
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 4 | ||||
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 348753edb2..ab774aa6a1 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2167,7 +2167,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr) case IS_CONSTANT_ARRAY: { TSRMLS_FETCH(); +#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); +#endif if (zvalue->value.ht && (zvalue->value.ht != &EG(symbol_table))) { /* break possible cycles */ Z_TYPE_P(zvalue) = IS_NULL; @@ -2180,7 +2182,9 @@ static void accel_fast_zval_ptr_dtor(zval **zval_ptr) { TSRMLS_FETCH(); +#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); +#endif Z_OBJ_HT_P(zvalue)->del_ref(zvalue TSRMLS_CC); } break; diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 06a2cf7f4a..653fb71121 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -27,7 +27,7 @@ #endif #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 */ /* 3 - added support for Optimizer's encoded-only-files mode */ /* 4 - works with the new Optimizer, that supports the file format with licenses */ |