From b9e169e6da933492b24ef2b6c2d20be265e7c531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Thu, 28 Jul 2022 20:31:48 +0200
Subject: [PATCH] Fix unstable sapi test, fix GH-9140

---
 sapi/cgi/cgi_main.c           |  1 +
 sapi/cgi/tests/005-win32.phpt | 34 ----------------------------------
 sapi/cgi/tests/005.phpt       | 21 ++++++---------------
 3 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 sapi/cgi/tests/005-win32.phpt

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 9e063597e6bbe..b45468031fcd0 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -2271,6 +2271,7 @@ consult the installation file that came with this distribution, or visit \n\
 
 						case 'a':	/* interactive mode */
 							printf("Interactive mode enabled\n\n");
+							fflush(stdout);
 							break;
 
 						case 'C': /* don't chdir to the script directory */
diff --git a/sapi/cgi/tests/005-win32.phpt b/sapi/cgi/tests/005-win32.phpt
deleted file mode 100644
index cafec91d3dbbd..0000000000000
--- a/sapi/cgi/tests/005-win32.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-using invalid combinations of cmdline options
---SKIPIF--
-<?php
-
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die ("skip Windows only");
-}
-
-include "skipif.inc";
-?>
---FILE--
-<?php
-
-include "include.inc";
-
-$php = get_cgi_path();
-reset_env_vars();
-
-var_dump(`$php -n -a -f "wrong"`);
-var_dump(`$php -n -f "wrong" -a`);
-
-echo "Done\n";
-?>
---EXPECT--
-string(51) "Interactive mode enabled
-
-No input file specified.
-"
-string(51) "Interactive mode enabled
-
-No input file specified.
-"
-Done
diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt
index a46ac912c7063..55247588b3b84 100644
--- a/sapi/cgi/tests/005.phpt
+++ b/sapi/cgi/tests/005.phpt
@@ -1,14 +1,5 @@
 --TEST--
 using invalid combinations of cmdline options
---SKIPIF--
-<?php
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die ("skip not for Windows");
-}
-
-include "skipif.inc";
-?>
 --FILE--
 <?php
 
@@ -17,18 +8,18 @@ include "include.inc";
 $php = get_cgi_path();
 reset_env_vars();
 
-var_dump(`$php -n -a -f 'wrong'`);
-var_dump(`$php -n -f 'wrong' -a`);
+var_dump(`$php -n -a -f "wrong"`);
+var_dump(`$php -n -f "wrong" -a`);
 
 echo "Done\n";
 ?>
 --EXPECT--
-string(51) "No input file specified.
-Interactive mode enabled
+string(51) "Interactive mode enabled
 
+No input file specified.
 "
-string(51) "No input file specified.
-Interactive mode enabled
+string(51) "Interactive mode enabled
 
+No input file specified.
 "
 Done