Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent race condition in opcache_reset()
This commit is contained in:
Dmitry Stogov 2019-05-21 00:08:22 +03:00
commit 83b12d5b57

View File

@ -813,7 +813,10 @@ static ZEND_FUNCTION(opcache_reset)
RETURN_FALSE;
}
/* exclusive lock */
zend_shared_alloc_lock();
zend_accel_schedule_restart(ACCEL_RESTART_USER);
zend_shared_alloc_unlock();
RETURN_TRUE;
}