diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-03 14:58:37 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-03 14:58:37 +0800 |
| commit | 2034ace0526657cbed0fafc3d77b1baa6604ae9e (patch) | |
| tree | 8d3c23fe87caff53397a381edb9d9ea12a70e6a1 | |
| parent | 533b1df7325673bf8159263379579d2142f57877 (diff) | |
| download | php-git-2034ace0526657cbed0fafc3d77b1baa6604ae9e.tar.gz | |
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | ext/opcache/zend_accelerator_util_funcs.c | 13 |
2 files changed, 9 insertions, 10 deletions
@@ -18,7 +18,11 @@ PHP NEWS (Adam) - FPM: - . Fix bug #67531 (syslog cannot be set in pool configuration). (Remi) + . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi) + +- OPCache: + . Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault + happen) (Dmitry, Laruence) - pgsql: . Fix bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756), diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c index 14c6f7490f..dbab902b26 100644 --- a/ext/opcache/zend_accelerator_util_funcs.c +++ b/ext/opcache/zend_accelerator_util_funcs.c @@ -837,16 +837,11 @@ static int zend_hash_unique_copy(HashTable *target, HashTable *source, unique_co if (p->nKeyLength > 0 && p->arKey[0] == 0) { /* Mangled key */ #if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO - if (((zend_function*)p->pData)->common.fn_flags & ZEND_ACC_CLOSURE) { - /* update closure */ - if (zend_hash_quick_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &t) == SUCCESS) { - if (pCopyConstructor) { - pCopyConstructor(t); - } + if (zend_hash_quick_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &t) == SUCCESS) { + if (pCopyConstructor) { + pCopyConstructor(t); } - } else { - /* ignore and wait for runtime */ - } + } #endif } else if (!ignore_dups && zend_hash_quick_find(target, p->arKey, p->nKeyLength, p->h, &t) == SUCCESS) { *fail_data = p->pData; |