iliaa Wed Feb 4 17:49:29 2004 EDT
Modified files:
/php-src/sapi/cli php_cli.c
Log:
Parse command line ini directives passed using -d before -i, to ensure
correct settings output.
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.107&r2=1.108&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.107 php-src/sapi/cli/php_cli.c:1.108
--- php-src/sapi/cli/php_cli.c:1.107 Tue Jan 13 22:14:17 2004
+++ php-src/sapi/cli/php_cli.c Wed Feb 4 17:49:28 2004
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.107 2004/01/14 03:14:17 wez Exp $ */
+/* $Id: php_cli.c,v 1.108 2004/02/04 22:49:28 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -641,10 +641,21 @@
exit_status=1;
goto out_err;
}
-
+
+ /* here is the place for hard coded defaults which cannot be
overwritten in the ini file */
+ INI_HARDCODED("register_argc_argv", "1");
+ INI_HARDCODED("html_errors", "0");
+ INI_HARDCODED("implicit_flush", "1");
+ INI_HARDCODED("output_buffering", "0");
+ INI_HARDCODED("max_execution_time", "0");
+
while ((c = php_getopt(argc, argv, OPTIONS, &optarg, &optind, 0)) !=
-1) {
switch (c) {
+ case 'd': /* define ini entries on command line */
+ define_command_line_ini_entry(optarg);
+ break;
+
case 'h': /* help & quit */
case '?':
php_output_startup();
@@ -696,12 +707,6 @@
/* Set some CLI defaults */
SG(options) |= SAPI_OPTION_NO_CHDIR;
- /* here is the place for hard coded defaults which cannot be
overwritten in the ini file */
- INI_HARDCODED("register_argc_argv", "1");
- INI_HARDCODED("html_errors", "0");
- INI_HARDCODED("implicit_flush", "1");
- INI_HARDCODED("output_buffering", "0");
- INI_HARDCODED("max_execution_time", "0");
optind = orig_optind;
optarg = orig_optarg;
@@ -717,9 +722,6 @@
case 'C': /* don't chdir to the script directory */
/* This is default so NOP */
break;
- case 'd': /* define ini entries on command line */
- define_command_line_ini_entry(optarg);
- break;
case 'e': /* enable extended info output */
CG(extended_info) = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
