From: Dmitry Stogov Date: Thu, 28 Mar 2013 09:45:40 +0000 (+0400) Subject: don't optimize script if it's not going to be cached X-Git-Tag: php-5.6.0alpha1~448^2~69^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ae5c55596c34cefa1a78b971df1ffffce5cf4a7;p=php don't optimize script if it's not going to be cached --- diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 5d5de443d3..168082ea13 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2686,7 +2686,11 @@ static void accel_op_array_handler(zend_op_array *op_array) { TSRMLS_FETCH(); - if (ZCG(enabled) && accel_startup_ok && ZCSG(accelerator_enabled)) { + if (ZCG(enabled) && + accel_startup_ok && + ZCSG(accelerator_enabled) && + !ZSMMG(memory_exhausted) && + !ZCSG(restart_pending)) { zend_optimizer(op_array TSRMLS_CC); } }