php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed parse_ini_file

Browse Source
This commit is contained in:
Xinchen Hui
2014-03-09 11:35:20 +08:00
parent 7668f7f95a
commit f1ed4f6bf9
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_ini_parser.y
+1 -1
View File
@@ -136,7 +136,7 @@ static void zend_ini_get_var(zval *result, zval *name TSRMLS_DC)
char *envvar;
/* Fetch configuration option value */
if (zend_get_configuration_directive(Z_STRVAL_P(name), Z_STRLEN_P(name)+1, &curval) == SUCCESS) {
if (zend_get_configuration_directive(Z_STRVAL_P(name), Z_STRLEN_P(name), &curval) == SUCCESS) {
ZVAL_PSTRINGL(result, Z_STRVAL(curval), Z_STRLEN(curval));
/* ..or if not found, try ENV */
} else if ((envvar = zend_getenv(Z_STRVAL_P(name), Z_STRLEN_P(name) TSRMLS_CC)) != NULL ||
ext/standard/basic_functions.c
+9 -15
View File
@@ -5906,33 +5906,27 @@ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, zval *arg3, int cal
ulong key = (ulong) zend_atol(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1));
if ((find_hash = zend_hash_index_find(Z_ARRVAL_P(arr), key)) == NULL) {
array_init(&hash);
zend_hash_index_update(Z_ARRVAL_P(arr), key, &hash);
} else {
ZVAL_COPY_VALUE(&hash, find_hash);
}
find_hash = zend_hash_index_update(Z_ARRVAL_P(arr), key, &hash);
}
} else {
if ((find_hash = zend_hash_find(Z_ARRVAL_P(arr), Z_STR_P(arg1))) == NULL) {
array_init(&hash);
zend_hash_update(Z_ARRVAL_P(arr), Z_STR_P(arg1), &hash);
} else {
ZVAL_COPY_VALUE(&hash, find_hash);
}
find_hash = zend_hash_update(Z_ARRVAL_P(arr), Z_STR_P(arg1), &hash);
}
}
if (Z_TYPE(hash) != IS_ARRAY) {
zval_dtor(&hash);
array_init(&hash);
if (Z_TYPE_P(find_hash) != IS_ARRAY) {
zval_dtor(find_hash);
array_init(find_hash);
}
ZVAL_DUP(&element, arg2);
if (arg3 && Z_STRLEN_P(arg3) > 0) {
//???
add_assoc_zval_ex(&hash, Z_STRVAL_P(arg3), Z_STRLEN_P(arg3), &element);
add_assoc_zval_ex(find_hash, Z_STRVAL_P(arg3), Z_STRLEN_P(arg3), &element);
} else {
add_next_index_zval(&hash, &element);
add_next_index_zval(find_hash, &element);
}
}
break;