cvs: php4 /sapi/cli php_cli.c
| From: | Marcus B�rger | Date: | Tue, 26 Mar 2002 11:22:20 +0000 |
| Subject: | cvs: php4 /sapi/cli php_cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10700@lists.php.net to get a copy of this message | ||
helly Tue Mar 26 06:22:20 2002 EDT
Modified files:
/php4/sapi/cli php_cli.c
Log:
fix behaviour on --
#now php -- -i for scriptfile -i works
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.14 php4/sapi/cli/php_cli.c:1.15
--- php4/sapi/cli/php_cli.c:1.14 Sun Mar 24 12:14:34 2002
+++ php4/sapi/cli/php_cli.c Tue Mar 26 06:22:20 2002
@@ -554,7 +554,8 @@
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++;
}