clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #52786 (PHP should reset section to [PHP] after ini sections). Patch by

Browse Source 
Fedora at famillecollet dot com.
This commit is contained in:
Adam Harvey 2010-09-09 05:11:05 +00:00
parent 6b72fef134
commit 02b2a28882
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/php_ini.c
View File

@ -201,6 +201,7 @@ PHPAPI void config_zval_dtor(zval *zvalue)
/* Reset / free active_ini_sectin global */
#define RESET_ACTIVE_INI_HASH() do { \
active_ini_hash = NULL; \
is_special_section = 0; \
} while (0)
/* }}} */
@ -650,9 +651,6 @@ int php_init_config(TSRMLS_D)
zend_llist_element *element;
int l, total_l = 0;
/* Reset active ini section */
RESET_ACTIVE_INI_HASH();
if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_alphasort)) > 0) {
zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
memset(&fh, 0, sizeof(fh));
@ -664,6 +662,9 @@ int php_init_config(TSRMLS_D)
free(namelist[i]);
continue;
}
/* Reset active ini section */
RESET_ACTIVE_INI_HASH();
if (IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
snprintf(ini_file, MAXPATHLEN, "%s%s", php_ini_scanned_path, namelist[i]->d_name);
} else {