sniper Fri Mar 18 17:11:53 2005 EDT
Modified files:
/php-src/sapi/cli php_cli.c
Log:
Revert bad idea. (no more error for invalid -d options)
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.120&r2=1.121&ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.120 php-src/sapi/cli/php_cli.c:1.121
--- php-src/sapi/cli/php_cli.c:1.120 Thu Mar 17 08:43:32 2005
+++ php-src/sapi/cli/php_cli.c Fri Mar 18 17:11:53 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.120 2005/03/17 13:43:32 sniper Exp $ */
+/* $Id: php_cli.c,v 1.121 2005/03/18 22:11:53 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -395,7 +395,7 @@
}
/* }}} */
-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 @@
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 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
