Merge branch 'PHP-5.5' into PHP-5.6

dstogov · dstogov · commit 834eaae52d4a · 2013-11-26T21:59:02.000+04:00
* PHP-5.5:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -2734,6 +2734,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);
@@ -2744,6 +2745,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 */

Original file line number	Diff line number	Diff line change
`@@ -2734,6 +2734,7 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC)`
`2734`	`2734`	`}`
`2735`	`2735`	`zend_accel_error(ACCEL_LOG_DEBUG, "Restart Scheduled!");`
`2736`	`2736`
	`2737`	`+ SHM_UNPROTECT();`
`2737`	`2738`	`ZCSG(restart_pending) = 1;`
`2738`	`2739`	`ZCSG(restart_reason) = reason;`
`2739`	`2740`	`ZCSG(cache_status_before_restart) = ZCSG(accelerator_enabled);`
`@@ -2744,6 +2745,7 @@ void zend_accel_schedule_restart(zend_accel_restart_reason reason TSRMLS_DC)`
`2744`	`2745`	`} else {`
`2745`	`2746`	`ZCSG(force_restart_time) = 0;`
`2746`	`2747`	`}`
	`2748`	`+ SHM_PROTECT();`
`2747`	`2749`	`}`
`2748`	`2750`
`2749`	`2751`	`/* this is needed because on WIN32 lock is not decreased unless ZCG(counted) is set */`