diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-06-04 03:22:00 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-06-04 03:22:00 +0200 |
| commit | 4ed171378978f3259af726d51ebfa50c1610106f (patch) | |
| tree | 64142d5cabae688ec9d02abc612c2b9950858c0e /ext/opcache/zend_persist.c | |
| parent | 57e698d58263edeb5e15d78e0a968298f65a439f (diff) | |
| parent | 848df6fcbe7b32f2c21ebdcfe1c1adb56753cad9 (diff) | |
| download | php-git-4ed171378978f3259af726d51ebfa50c1610106f.tar.gz | |
Merge branch 'PHP-5.6' into PHP-5.6.0
* PHP-5.6: (51 commits)
Fix tests
Fix possible segfault depending on memory location...
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
Fixed regression introduced by patch for bug #67072
Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
(re)add cve number in NEWS, from 5.4.29
NEWS
NEWS
NEWS
Fix bug #67326 fileinfo: cdf_read_short_sector insufficient boundary check
add NEWS block for 5.6.0RC1
Update NEWs
Update NEWs
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
updated libmagic.patch for 5.6+
updated libmagic.patch for 5.4+
...
Conflicts:
NEWS
Diffstat (limited to 'ext/opcache/zend_persist.c')
| -rw-r--r-- | ext/opcache/zend_persist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 17f8e8798f..fdc21d6c5d 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -686,6 +686,12 @@ static int zend_update_parent_ce(zend_class_entry **pce TSRMLS_DC) ce->__callstatic->op_array.refcount++; } #endif +#if ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO + if (ce->__debugInfo) { + ce->__debugInfo = zend_shared_alloc_get_xlat_entry(ce->__debugInfo); + ce->__debugInfo->op_array.refcount++; + } +#endif zend_hash_apply(&ce->properties_info, (apply_func_t) zend_update_property_info_ce TSRMLS_CC); return 0; } |