Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit 1c16749eaa76 · 2021-03-05T15:08:24.000+01:00
* PHP-7.4:
  Print error code if CreateMutex() fails
diff --git a/ext/opcache/shared_alloc_win32.c b/ext/opcache/shared_alloc_win32.c
@@ -81,7 +81,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
`@@ -81,7 +81,7 @@ void zend_shared_alloc_create_lock(void)`
`81`	`81`	`{`
`82`	`82`	`memory_mutex = CreateMutex(NULL, FALSE, create_name_with_username(ACCEL_MUTEX_NAME));`
`83`	`83`	`if (!memory_mutex) {`
`84`		`- zend_accel_error(ACCEL_LOG_FATAL, "Cannot create mutex");`
	`84`	`+ zend_accel_error(ACCEL_LOG_FATAL, "Cannot create mutex (error %u)", GetLastError());`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`	`ReleaseMutex(memory_mutex);`