Commit b9e169e

committed

Fix unstable sapi test, fix GH-9140

1 parent b948f80 commit b9e169eCopy full SHA for b9e169e

File tree

-49

lines changed

-49

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2271,6 +2271,7 @@ consult the installation file that came with this distribution, or visit \n\`
`2271`	`2271`
`2272`	`2272`	`case 'a': /* interactive mode */`
`2273`	`2273`	`printf("Interactive mode enabled\n\n");`
	`2274`	`+ fflush(stdout);`
`2274`	`2275`	`break;`
`2275`	`2276`
`2276`	`2277`	`case 'C': /* don't chdir to the script directory */`

Lines changed: 0 additions & 34 deletions

This file was deleted.

Lines changed: 6 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,5 @@`
`1`	`1`	`--TEST--`
`2`	`2`	`using invalid combinations of cmdline options`
`3`		`---SKIPIF--`
`4`		`-<?php`
`5`		`-`
`6`		`-if (substr(PHP_OS, 0, 3) == 'WIN') {`
`7`		`- die ("skip not for Windows");`
`8`		`-}`
`9`		`-`
`10`		`-include "skipif.inc";`
`11`		`-?>`
`12`	`3`	`--FILE--`
`13`	`4`	`<?php`
`14`	`5`
`@@ -17,18 +8,18 @@ include "include.inc";`
`17`	`8`	`$php = get_cgi_path();`
`18`	`9`	`reset_env_vars();`
`19`	`10`
`20`		-var_dump(`$php -n -a -f 'wrong'`);
`21`		-var_dump(`$php -n -f 'wrong' -a`);
	`11`	+var_dump(`$php -n -a -f "wrong"`);
	`12`	+var_dump(`$php -n -f "wrong" -a`);
`22`	`13`
`23`	`14`	`echo "Done\n";`
`24`	`15`	`?>`
`25`	`16`	`--EXPECT--`
`26`		`-string(51) "No input file specified.`
`27`		`-Interactive mode enabled`
	`17`	`+string(51) "Interactive mode enabled`
`28`	`18`
	`19`	`+No input file specified.`
`29`	`20`	`"`
`30`		`-string(51) "No input file specified.`
`31`		`-Interactive mode enabled`
	`21`	`+string(51) "Interactive mode enabled`
`32`	`22`
	`23`	`+No input file specified.`
`33`	`24`	`"`
`34`	`25`	`Done`

Comments

(0)