Commit 810632a

committed

Address some comments

1 parent 935a283 commit 810632aCopy full SHA for 810632a

File tree

3 files changed

+13

-15

lines changed

sapi
- cgi/tests
  - 012.phpt
- cli
  - php_cli.c
  - tests
    - 024.phpt

3 files changed

+13

-15

lines changed

`‎sapi/cgi/tests/012.phpt‎`

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function run_and_output($cmd) {`
`14`	`14`	`}`
`15`	`15`	`exec($cmd, $output, $exit_code);`
`16`	`16`	`print_r($output);`
`17`		`- var_dump($exit_code == 0);`
	`17`	`+ var_dump($exit_code);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`$php = get_cgi_path();`
`@@ -33,9 +33,6 @@ echo "hi";`
`33`	`33`
`34`	`34`	`file_put_contents($filename_good, $code);`
`35`	`35`
`36`		`-run_and_output("$php -n -l $filename_good_escaped$filename_good_escaped");`
`37`		`-run_and_output("$php -n -l $filename_good_escaped some.unknown $filename_good_escaped");`
`38`		`-`
`39`	`36`	`$code = '`
`40`	`37`	`<?php`
`41`	`38`
`@@ -48,6 +45,8 @@ class test`
`48`	`45`
`49`	`46`	`file_put_contents($filename_bad, $code);`
`50`	`47`
	`48`	`+run_and_output("$php -n -l $filename_good_escaped$filename_good_escaped");`
	`49`	`+run_and_output("$php -n -l $filename_good_escaped some.unknown $filename_good_escaped");`
`51`	`50`	`run_and_output("$php -n -l $filename_good_escaped$filename_bad_escaped$filename_good_escaped");`
`52`	`51`	`run_and_output("$php -n -l $filename_bad_escaped$filename_bad_escaped");`
`53`	`52`	`run_and_output("$php -n -l $filename_bad_escaped some.unknown $filename_bad_escaped");`
`@@ -66,13 +65,13 @@ Array`
`66`	`65`	`[0] => No syntax errors detected in %s012_good.test.php`
`67`	`66`	`[1] => No syntax errors detected in %s012_good.test.php`
`68`	`67`	`)`
`69`		`-bool(true)`
	`68`	`+int(0)`
`70`	`69`	`Array`
`71`	`70`	`(`
`72`	`71`	`[0] => No syntax errors detected in %s012_good.test.php`
`73`	`72`	`[1] => No input file specified.`
`74`	`73`	`)`
`75`		`-bool(false)`
	`74`	`+int(255)`
`76`	`75`	`Array`
`77`	`76`	`(`
`78`	`77`	`[0] => No syntax errors detected in %s012_good.test.php`
`@@ -81,7 +80,7 @@ Array`
`81`	`80`	`[3] => Errors parsing %s012_bad.test.php`
`82`	`81`	`[4] => No syntax errors detected in %s012_good.test.php`
`83`	`82`	`)`
`84`		`-bool(false)`
	`83`	`+int(255)`
`85`	`84`	`Array`
`86`	`85`	`(`
`87`	`86`	`[0] => <br />`
`@@ -91,15 +90,15 @@ Array`
`91`	`90`	`[4] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br />`
`92`	`91`	`[5] => Errors parsing %s012_bad.test.php`
`93`	`92`	`)`
`94`		`-bool(false)`
	`93`	`+int(255)`
`95`	`94`	`Array`
`96`	`95`	`(`
`97`	`96`	`[0] => <br />`
`98`	`97`	`[1] => <b>Parse error</b>: syntax error, unexpected token "private", expecting "{" in <b>%s012_bad.test.php</b> on line <b>5</b><br />`
`99`	`98`	`[2] => Errors parsing %s012_bad.test.php`
`100`	`99`	`[3] => No input file specified.`
`101`	`100`	`)`
`102`		`-bool(false)`
	`101`	`+int(255)`
`103`	`102`	`Array`
`104`	`103`	`(`
`105`	`104`	`[0] => <br />`
`@@ -110,5 +109,5 @@ Array`
`110`	`109`	`[5] => Errors parsing %s012_bad.test.php`
`111`	`110`	`[6] => No input file specified.`
`112`	`111`	`)`
`113`		`-bool(false)`
	`112`	`+int(255)`
`114`	`113`	`Done`

`‎sapi/cli/php_cli.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1131,14 +1131,14 @@ static int do_cli(int argc, char *argv) / {{{ */`
`1131`	`1131`	`}`
`1132`	`1132`	`if (request_started) {`
`1133`	`1133`	`php_request_shutdown((void *) 0);`
	`1134`	`+ request_started = 0;`
`1134`	`1135`	`}`
`1135`	`1136`	`if (translated_path) {`
`1136`	`1137`	`free(translated_path);`
	`1138`	`+ translated_path = NULL;`
`1137`	`1139`	`}`
`1138`	`1140`	`if (behavior == PHP_MODE_LINT && argc > php_optind && strcmp(argv[php_optind],"--")) {`
`1139`	`1141`	`script_file = NULL;`
`1140`		`- request_started = 0;`
`1141`		`- translated_path = NULL;`
`1142`	`1142`	`goto do_repeat;`
`1143`	`1143`	`}`
`1144`	`1144`	`/* Don't repeat fork()ed processes. */`

`‎sapi/cli/tests/024.phpt‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@ echo "hi";`
`26`	`26`
`27`	`27`	`file_put_contents($filename_good, $code);`
`28`	`28`
`29`		`-run_and_output("$php -n -l $filename_good_escaped$filename_good_escaped");`
`30`		`-run_and_output("$php -n -l $filename_good_escaped some.unknown $filename_good_escaped");`
`31`		`-`
`32`	`29`	`$code = '`
`33`	`30`	`<?php`
`34`	`31`
`@@ -41,6 +38,8 @@ class test`
`41`	`38`
`42`	`39`	`file_put_contents($filename_bad, $code);`
`43`	`40`
	`41`	`+run_and_output("$php -n -l $filename_good_escaped$filename_good_escaped");`
	`42`	`+run_and_output("$php -n -l $filename_good_escaped some.unknown $filename_good_escaped");`
`44`	`43`	`run_and_output("$php -n -l $filename_good_escaped$filename_bad_escaped$filename_good_escaped");`
`45`	`44`	`run_and_output("$php -n -l $filename_bad_escaped$filename_bad_escaped");`
`46`	`45`	`run_and_output("$php -n -l $filename_bad_escaped some.unknown $filename_bad_escaped");`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 810632a

File tree

3 files changed

3 files changed

`‎sapi/cgi/tests/012.phpt‎`

`‎sapi/cli/php_cli.c‎`

`‎sapi/cli/tests/024.phpt‎`

0 commit comments