Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4

George Wang · George Wang · commit 8fc0bdfb0ad5 · 2021-03-05T10:57:46.000-05:00
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
@@ -80,7 +80,7 @@ void zend_shared_alloc_create_lock(void)
 {
 	memory_mutex = CreateMutex(NULL, FALSE, create_name_with_username(ACCEL_MUTEX_NAME));
 	if (!memory_mutex) {
-		zend_accel_error(ACCEL_LOG_FATAL, "Cannot create mutex");
+		zend_accel_error(ACCEL_LOG_FATAL, "Cannot create mutex (error %u)", GetLastError());
 		return;
 	}
 	ReleaseMutex(memory_mutex);

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ void zend_shared_alloc_create_lock(void)`
`80`	`80`	`{`
`81`	`81`	`memory_mutex = CreateMutex(NULL, FALSE, create_name_with_username(ACCEL_MUTEX_NAME));`
`82`	`82`	`if (!memory_mutex) {`
`83`		`- zend_accel_error(ACCEL_LOG_FATAL, "Cannot create mutex");`
	`83`	`+ zend_accel_error(ACCEL_LOG_FATAL, "Cannot create mutex (error %u)", GetLastError());`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`	`86`	`ReleaseMutex(memory_mutex);`