archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MFH: - Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty)

Browse source
This commit is contained in:
foobar 2005-09-01 14:44:15 +00:00
parent 248c30dad7
commit 64cfbf539f
4 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
main/php_ini.c
View file

@ -163,16 +163,6 @@ PHPAPI void display_ini_entries(zend_module_entry *module)
# endif
#endif
/* {{{ pvalue_config_destructor
*/
static void pvalue_config_destructor(zval *pvalue)
{
if (Z_TYPE_P(pvalue) == IS_STRING) {
free(Z_STRVAL_P(pvalue));
}
}
/* }}} */
/* {{{ php_config_ini_parser_cb
*/
static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, void *arg)
@ -254,9 +244,29 @@ static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
}
/* }}} */
/* {{{ pvalue_config_destructor
*/
static void pvalue_config_destructor(zval *pvalue)
{
if (Z_TYPE_P(pvalue) == IS_STRING) {
free(Z_STRVAL_P(pvalue));
}
}
/* }}} */
/* {{{ php_init_config_hash
*/
int php_init_config_hash(void)
{
if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1) == FAILURE) {
return FAILURE;
}
}
/* }}} */
/* {{{ php_init_config
*/
int php_init_config()
int php_init_config(TSRMLS_D)
{
char *php_ini_search_path = NULL;
int safe_mode_state;
@ -269,11 +279,6 @@ int php_init_config()
zend_llist scanned_ini_list;
int l, total_l=0;
zend_llist_element *element;
TSRMLS_FETCH();
if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1) == FAILURE) {
return FAILURE;
}
if (sapi_module.ini_defaults) {
sapi_module.ini_defaults(&configuration_hash);