Merge branch 'PHP-5.5' into PHP-5.6

laruence · laruence · commit 6183408031d9 · 2015-03-03T23:17:37.000+08:00
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -582,7 +582,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check)
 	ZCSG(force_restart_time) = 0;
 	while (mem_usage_check->l_pid > 0) {
 		while (tries--) {
-			zend_accel_error(ACCEL_LOG_INFO, "Killed locker %d", mem_usage_check->l_pid);
+			zend_accel_error(ACCEL_LOG_ERROR, "Killed locker %d", mem_usage_check->l_pid);
 			if (kill(mem_usage_check->l_pid, SIGKILL)) {
 				break;
 			}
@@ -595,7 +595,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check)
 			usleep(10000);
 		}
 		if (!tries) {
-			zend_accel_error(ACCEL_LOG_INFO, "Can't kill %d after 20 tries!", mem_usage_check->l_pid);
+			zend_accel_error(ACCEL_LOG_ERROR, "Can't kill %d after 20 tries!", mem_usage_check->l_pid);
 			ZCSG(force_restart_time) = time(NULL); /* restore forced restart request */
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check)`
`582`	`582`	`ZCSG(force_restart_time) = 0;`
`583`	`583`	`while (mem_usage_check->l_pid > 0) {`
`584`	`584`	`while (tries--) {`
`585`		`- zend_accel_error(ACCEL_LOG_INFO, "Killed locker %d", mem_usage_check->l_pid);`
	`585`	`+ zend_accel_error(ACCEL_LOG_ERROR, "Killed locker %d", mem_usage_check->l_pid);`
`586`	`586`	`if (kill(mem_usage_check->l_pid, SIGKILL)) {`
`587`	`587`	`break;`
`588`	`588`	`}`
`@@ -595,7 +595,7 @@ static inline void kill_all_lockers(struct flock *mem_usage_check)`
`595`	`595`	`usleep(10000);`
`596`	`596`	`}`
`597`	`597`	`if (!tries) {`
`598`		`- zend_accel_error(ACCEL_LOG_INFO, "Can't kill %d after 20 tries!", mem_usage_check->l_pid);`
	`598`	`+ zend_accel_error(ACCEL_LOG_ERROR, "Can't kill %d after 20 tries!", mem_usage_check->l_pid);`
`599`	`599`	`ZCSG(force_restart_time) = time(NULL); /* restore forced restart request */`
`600`	`600`	`}`
`601`	`601`