Skip to content

Fix unstable sapi output, fix GH-9140 #9184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Fix unstable sapi output, fix GH-9140 #9184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sapi/cgi/cgi_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
34 changes: 0 additions & 34 deletions sapi/cgi/tests/005-win32.phpt
View file
Open in desktop

This file was deleted.

21 changes: 6 additions & 15 deletions sapi/cgi/tests/005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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