com php-src: Disable opcache.fast_shutdown if USE_ZEN D_ALLOC=0: ext/opcache/ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Thu, 09 Jul 2015 09:19:51 +0000 |
| Subject: | com php-src: Disable opcache.fast_shutdown if USE_ZEN D_ALLOC=0: ext/opcache/ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87860@lists.php.net to get a copy of this message | ||
Commit: b77fa94cf912ecbe03728cceede63ae1c863d1b1
Author: Dmitry Stogov <dmitry@zend.com> Thu, 9 Jul 2015 12:19:51 +0300
Parents: 225bb7049842ea4623ccdda2900efdcc4491fdb0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b77fa94cf912ecbe03728cceede63ae1c863d1b1
Log:
Disable opcache.fast_shutdown if USE_ZEND_ALLOC=0
Changed paths:
M ext/opcache/ZendAccelerator.c
Diff:
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
index 2234d5e..b1feb54 100644
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@ -2290,7 +2290,7 @@ static void accel_deactivate(void)
ZCG(counted) = 0;
#if !ZEND_DEBUG
- if (ZCG(accel_directives).fast_shutdown) {
+ if (ZCG(accel_directives).fast_shutdown && is_zend_mm()) {
zend_accel_fast_shutdown();
}
#endif