diff options
| author | foobar <sniper@php.net> | 2002-03-27 22:49:21 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-03-27 22:49:21 +0000 |
| commit | 49ba2a983b42fa7447883afcf410181e6601fd48 (patch) | |
| tree | 9a239de1d4425bde5a47f0f54d4d09b2b7ff3832 /sapi/cli/php_cli.c | |
| parent | 113f08bc4bd02e813bcbc1c5883889eec6612953 (diff) | |
| download | php-git-49ba2a983b42fa7447883afcf410181e6601fd48.tar.gz | |
WS fix
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index da755de460..42a40a637a 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -312,8 +312,8 @@ int main(int argc, char *argv[]) char *script_file=NULL; zend_llist global_vars; int interactive=0; - char *exec_direct=NULL; - char *param_error=NULL; + char *exec_direct=NULL; + char *param_error=NULL; /* end of temporary locals */ #ifdef ZTS zend_compiler_globals *compiler_globals; @@ -395,7 +395,7 @@ int main(int argc, char *argv[]) /* 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("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); zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); @@ -661,9 +661,9 @@ int main(int argc, char *argv[]) break; #endif case PHP_MODE_CLI_DIRECT: - if (zend_eval_string(exec_direct, NULL, "Command line code" TSRMLS_CC) == FAILURE) { - exit_status=254; - } + if (zend_eval_string(exec_direct, NULL, "Command line code" TSRMLS_CC) == FAILURE) { + exit_status=254; + } } php_request_shutdown((void *) 0); @@ -672,7 +672,6 @@ int main(int argc, char *argv[]) free(cli_sapi_module.php_ini_path_override); } - } zend_catch { exit_status = 255; } zend_end_try(); |