CVS update: php4

Date: Saturday June 19, 1999 @ 18:56 Author: zeev Update of /repository/php4 In directory php:/tmp/cvs-serv14267 Modified Files: main.c Log Message: Index: php4/main.c diff -u php4/main.c:1.75 php4/main.c:1.76 --- php4/main.c:1.75 Sat Jun 19 15:23:24 1999 +++ php4/main.c Sat Jun 19 18:56:34 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.75 1999/06/19 19:23:24 zeev Exp $ */ +/* $Id: main.c,v 1.76 1999/06/19 22:56:34 zeev Exp $ */ #include <stdio.h> @@ -553,12 +553,10 @@ static int php_get_ini_entry_for_zend(char *name, uint name_length, zval *contents) { - php_ini_entry *ini_entry = get_ini_entry(name, name_length); + zval *retval = cfg_get_entry(name, name_length); - if (ini_entry) { - contents->type = IS_STRING; - contents->value.str.val = ini_entry->value; - contents->value.str.len = ini_entry->value_length; + if (retval) { + *contents = *retval; return SUCCESS; } else { return FAILURE;