Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Prevent race condition in opcache_reset()
This commit is contained in:
Dmitry Stogov 2019-05-21 00:08:12 +03:00
commit e2f8d906cf

View File

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