Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit f6c9319bece4 · 2020-01-09T19:03:43.000+01:00
* PHP-7.4:
  Silence potential taskkill error messages
diff --git a/ext/standard/tests/streams/bug78883.phpt b/ext/standard/tests/streams/bug78883.phpt
@@ -22,7 +22,7 @@ $bug_is_present = !proc_get_status($proc)['running'];
 if (!$bug_is_present) {
 	// if the bug is not present, it will hang waiting for stdin,
 	// thus cmd is still running and we should kill it
-	shell_exec("taskkill /T /F /PID {$pid}");
+	shell_exec("taskkill /T /F /PID {$pid} 2>nul");
 }
 fclose($pipes[0]);
 fclose($pipes[1]);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ $bug_is_present = !proc_get_status($proc)['running'];`
`22`	`22`	`if (!$bug_is_present) {`
`23`	`23`	`// if the bug is not present, it will hang waiting for stdin,`
`24`	`24`	`// thus cmd is still running and we should kill it`
`25`		`- shell_exec("taskkill /T /F /PID {$pid}");`
	`25`	`+ shell_exec("taskkill /T /F /PID {$pid} 2>nul");`
`26`	`26`	`}`
`27`	`27`	`fclose($pipes[0]);`
`28`	`28`	`fclose($pipes[1]);`