cvs: php4 /sapi/cli php_cli.c

edink Thu Feb 14 11:45:07 2002 EDT Modified files: /php4/sapi/cli php_cli.c Log: Turned implicit_flush on. Cleaned up help text. Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.4 php4/sapi/cli/php_cli.c:1.5 --- php4/sapi/cli/php_cli.c:1.4 Wed Jan 23 08:41:52 2002 +++ php4/sapi/cli/php_cli.c Thu Feb 14 11:45:07 2002 @@ -239,13 +239,11 @@ prog = "php"; } - php_printf("Usage: %s [-q] [-h] [-s [-v] [-i] [-f <file>] | {<file> [args...]}\n" - " -q Quiet-mode. Suppress HTTP Header output.\n" + php_printf("Usage: %s [-h] [-s] [-v] [-i] [-f <file>] | {<file> [args...]}\n" " -s Display colour syntax highlighted source.\n" " -w Display source with stripped comments and whitespace.\n" - " -f <file> Parse <file>. Implies `-q'\n" + " -f <file> Parse <file>.\n" " -v Version number\n" - " -C Do not chdir to the script's directory\n" " -c <path> Look for php.ini file in this directory\n" " -a Run interactively\n" " -d foo[=bar] Define INI entry foo with value 'bar'\n" @@ -254,7 +252,7 @@ " -l Syntax check only (lint)\n" " -m Show compiled in modules\n" " -i PHP information\n" - " -h This help\n", prog); + " -h This help\n", prog); } /* }}} */ @@ -386,6 +384,7 @@ /* Set some CLI defaults */ SG(options) |= SAPI_OPTION_NO_CHDIR; zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry("implicit_flush", 15, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) { switch (c) {