summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2002-03-26 11:22:20 +0000
committerMarcus Boerger <helly@php.net>2002-03-26 11:22:20 +0000
commita2631c1f1da4f67d8825e63f4487468b191dfedc (patch)
tree1cddd9aa644e99d5f6dff0b9ba6ffab1013f5708 /sapi/cli/php_cli.c
parentfb048880aa4ed22fb6c5cc43e91c2074b753c243 (diff)
downloadphp-git-a2631c1f1da4f67d8825e63f4487468b191dfedc.tar.gz
fix behaviour on --
#now php -- -i for scriptfile -i works
Diffstat (limited to 'sapi/cli/php_cli.c')
-rw-r--r--sapi/cli/php_cli.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 94d022b869..7a0bf11aea 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -554,7 +554,8 @@ int main(int argc, char *argv[])
CG(interactive) = interactive;
/* only set script_file if not set already and not in direct mode and not at end of parameter list */
- if (argc > ap_php_optind && !script_file && !exec_direct && strcmp(argv[ap_php_optind-1],"--")) {
+ if (argc > ap_php_optind && !script_file && behavior==PHP_MODE_STANDARD && !strcmp(argv[ap_php_optind-1],"--")) {
+ no_headers = 1;
script_file=argv[ap_php_optind];
ap_php_optind++;
}