Merge branch 'PHP-7.4' into PHP-8.0

cmb69 · cmb69 · commit fb683030bf77 · 2021-02-25T12:03:43.000+01:00
* PHP-7.4:
  Capture Microsoft-defined HRESULT exit codes exit codes
diff --git a/run-tests.php b/run-tests.php
@@ -1294,6 +1294,9 @@ function system_with_timeout(
     }
     if ($stat["exitcode"] > 128 && $stat["exitcode"] < 160) {
         $data .= "\nTermsig=" . ($stat["exitcode"] - 128) . "\n";
+    } else if (defined('PHP_WINDOWS_VERSION_MAJOR') && (($stat["exitcode"] >> 28) & 0b1111) === 0b1100) {
+        // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/87fba13e-bf06-450e-83b1-9241dc81e781
+        $data .= "\nTermsig=" . $stat["exitcode"] . "\n";
     }
 
     proc_close($proc);

Original file line number	Diff line number	Diff line change
`@@ -1294,6 +1294,9 @@ function system_with_timeout(`
`1294`	`1294`	`}`
`1295`	`1295`	`if ($stat["exitcode"] > 128 && $stat["exitcode"] < 160) {`
`1296`	`1296`	`$data .= "\nTermsig=" . ($stat["exitcode"] - 128) . "\n";`
	`1297`	`+ } else if (defined('PHP_WINDOWS_VERSION_MAJOR') && (($stat["exitcode"] >> 28) & 0b1111) === 0b1100) {`
	`1298`	`+ // https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/87fba13e-bf06-450e-83b1-9241dc81e781`
	`1299`	`+ $data .= "\nTermsig=" . $stat["exitcode"] . "\n";`
`1297`	`1300`	`}`
`1298`	`1301`
`1299`	`1302`	`proc_close($proc);`