diff options
| author | foobar <sniper@php.net> | 2005-03-18 22:11:53 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-03-18 22:11:53 +0000 |
| commit | a98460beaca5202ab0928356b5622a8a70e5dd4a (patch) | |
| tree | c92ee0ebb28ce9b726421338810b4228618e397a | |
| parent | bbe98a88f34b24685a5d563354f7b90a4e73c1d1 (diff) | |
| download | php-git-a98460beaca5202ab0928356b5622a8a70e5dd4a.tar.gz | |
Revert bad idea. (no more error for invalid -d options)
| -rw-r--r-- | sapi/cli/php_cli.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 6fe8982f35..aab039a8f6 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -395,7 +395,7 @@ static void php_cli_usage(char *argv0) } /* }}} */ -static int define_command_line_ini_entry(char *arg TSRMLS_DC) +static void define_command_line_ini_entry(char *arg TSRMLS_DC) { char *name, *value; @@ -413,9 +413,8 @@ static int define_command_line_ini_entry(char *arg TSRMLS_DC) ZVAL_STRING(&extension, value, 0); php_dl(&extension, MODULE_PERSISTENT, &zval TSRMLS_CC); } else { - return zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry(name, strlen(name)+1, value, strlen(value), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); } - return SUCCESS; } @@ -662,10 +661,7 @@ int main(int argc, char *argv[]) switch (c) { case 'd': /* define ini entries on command line */ - if (define_command_line_ini_entry(php_optarg TSRMLS_CC) == FAILURE) { - zend_printf("Invalid php.ini entry '%s'.\n", php_optarg); - goto err; - } + define_command_line_ini_entry(php_optarg TSRMLS_CC); break; case 'h': /* help & quit */ |