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 5d5de443d30f2b3f11f897fd1ddd13a4a07e936a..168082ea13acd30134d2a3468c25e47337e53cc1 100644 (file)
--- 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);
        }
 }