diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-11-26 21:57:32 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-11-26 21:57:32 +0400 |
| commit | de658171360cc480105eaf932f94c15b24687a83 (patch) | |
| tree | 3c4dbb4ad28c4c435c91fdebbc1503d7cbb73822 | |
| parent | 2381b817aa850f08e67e338ec4a430b01d935e88 (diff) | |
| download | php-git-de658171360cc480105eaf932f94c15b24687a83.tar.gz | |
Fixed opcahce_reset() crash when opcache.protect_memory is set
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index b2efce9ea2..c0edf7e477 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -2730,6 +2730,7 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC) } zend_accel_error(ACCEL_LOG_DEBUG, "Restart Scheduled!"); + SHM_UNPROTECT(); ZCSG(restart_pending) = 1; ZCSG(restart_reason) = reason; ZCSG(cache_status_before_restart) = ZCSG(accelerator_enabled); @@ -2740,6 +2741,7 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC) } else { ZCSG(force_restart_time) = 0; } + SHM_PROTECT(); } /* this is needed because on WIN32 lock is not decreased unless ZCG(counted) is set */ |