clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show "php://stdin" instead of "-" in error messages

Browse Source
This commit is contained in:
Andrea Faulds 2015-05-21 18:08:01 +01:00 committed by Joe Watkins
parent 28ebf8df66
commit a103aa2dbd
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/main.c
View File

@ -2483,7 +2483,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file)
* otherwise it will get opened and added to the included_files list in zend_execute_scripts
*/
if (primary_file->filename &&
(primary_file->filename[0] != '-' || primary_file->filename[1] != 0) &&
strcmp("php://stdin", primary_file->filename) &&
primary_file->opened_path == NULL &&
primary_file->type != ZEND_HANDLE_FILENAME
) {

2
sapi/cgi/cgi_main.c
View File

@ -2431,7 +2431,7 @@ consult the installation file that came with this distribution, or visit \n\
file_handle.filename = SG(request_info).path_translated;
file_handle.handle.fp = NULL;
} else {
file_handle.filename = "-";
file_handle.filename = "php://stdin";
file_handle.type = ZEND_HANDLE_FP;
file_handle.handle.fp = stdin;
}

2
sapi/cgi/tests/007.phpt
View File

@ -17,6 +17,6 @@ var_dump(`"$php" -n -s -w -l`);
--EXPECTF--
string(25) "No input file specified.
"
string(31) "No syntax errors detected in -
string(41) "No syntax errors detected in php://stdin
"
===DONE===

4
sapi/cli/php_cli.c
View File

@ -945,7 +945,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
/* here but this would make things only more complicated. And it */
/* is consitent with the way -R works where the stdin file handle*/
/* is also accessible. */
file_handle.filename = "-";
file_handle.filename = "php://stdin";
file_handle.handle.fp = stdin;
}
file_handle.type = ZEND_HANDLE_FP;
@ -984,7 +984,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
PG(during_request_startup) = 0;
switch (behavior) {
case PHP_MODE_STANDARD:
if (strcmp(file_handle.filename, "-")) {
if (strcmp(file_handle.filename, "php://stdin")) {
cli_register_file_handles();
}

2
sapi/cli/tests/015.phpt
View File

@ -24,7 +24,7 @@ echo "Done\n";
PHP %d.%d.%d%s(cli) (built: %s)%s
Array
(
[0] => -
[0] => php://stdin
[1] => foo
[2] => bar
[3] => baz