1 --- php-5.4.0RC3/main/php_ini.c~ 2011-12-10 03:26:15.000000000 +0200
2 +++ php-5.4.0RC3/main/php_ini.c 2011-12-10 03:26:54.901295707 +0200
5 int free_ini_search_path = 0;
7 + static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
9 if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) config_zval_dtor, 1) == FAILURE) {
13 char *default_location;
15 - static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
18 char phprc_path[MAXPATHLEN];
21 /* Scan and parse any .ini files found in scan path if path not empty. */
22 if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
23 - struct dirent **namelist;
26 char ini_file[MAXPATHLEN];
28 + char *p, *last, *path_copy, *ini_path = NULL;
30 zend_llist scanned_ini_list;
31 zend_llist_element *element;
34 - if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_alphasort)) > 0) {
35 - zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
36 - memset(&fh2, 0, sizeof(fh2));
38 - for (i = 0; i < ndir; i++) {
40 - /* check for any file with .ini extension */
41 - if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
45 - /* Reset active ini section */
46 - RESET_ACTIVE_INI_HASH();
48 - if (IS_SLASH(php_ini_scanned_path[php_ini_scanned_path_len - 1])) {
49 - snprintf(ini_file, MAXPATHLEN, "%s%s", php_ini_scanned_path, namelist[i]->d_name);
51 - snprintf(ini_file, MAXPATHLEN, "%s%c%s", php_ini_scanned_path, DEFAULT_SLASH, namelist[i]->d_name);
53 - if (VCWD_STAT(ini_file, &sb) == 0) {
54 - if (S_ISREG(sb.st_mode)) {
55 - if ((fh2.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
56 - fh2.filename = ini_file;
57 - fh2.type = ZEND_HANDLE_FP;
59 - if (zend_parse_ini_file(&fh2, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
60 - /* Here, add it to the list of ini files read */
61 - l = strlen(ini_file);
63 - p = estrndup(ini_file, l);
64 - zend_llist_add_element(&scanned_ini_list, &p);
65 + /* List of found ini files */
66 + zend_llist_init(&scanned_ini_list, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
68 + /* Split by paths_separator and load ini-files from all paths */
69 + path_copy = estrdup(php_ini_scanned_path);
70 + ini_path = php_strtok_r(path_copy, paths_separator, &last);
72 + while (ini_path != NULL) {
73 + struct dirent **namelist;
74 + int ini_path_len = strlen(ini_path);
76 + if ((ndir = php_scandir(ini_path, &namelist, 0, php_alphasort)) > 0) {
77 + memset(&fh2, 0, sizeof(fh2));
79 + for (i = 0; i < ndir; i++) {
80 + /* check for any file with .ini extension */
81 + if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
85 + /* Reset active ini section */
86 + RESET_ACTIVE_INI_HASH();
88 + if (IS_SLASH(ini_path[ini_path_len - 1])) {
89 + snprintf(ini_file, MAXPATHLEN, "%s%s", ini_path, namelist[i]->d_name);
91 + snprintf(ini_file, MAXPATHLEN, "%s%c%s", ini_path, DEFAULT_SLASH, namelist[i]->d_name);
93 + if (VCWD_STAT(ini_file, &sb) == 0) {
94 + if (S_ISREG(sb.st_mode)) {
95 + if ((fh2.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
96 + fh2.filename = ini_file;
97 + fh2.type = ZEND_HANDLE_FP;
99 + /* Reset active ini section */
100 + RESET_ACTIVE_INI_HASH();
102 + if (zend_parse_ini_file(&fh2, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC) == SUCCESS) {
103 + /* Here, add it to the list of ini files read */
104 + l = strlen(ini_file);
106 + p = estrndup(ini_file, l);
107 + zend_llist_add_element(&scanned_ini_list, &p);
120 - int php_ini_scanned_files_len = (php_ini_scanned_files) ? strlen(php_ini_scanned_files) + 1 : 0;
121 - php_ini_scanned_files = (char *) realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);
122 - if (!php_ini_scanned_files_len) {
123 - *php_ini_scanned_files = '\0';
125 - total_l += php_ini_scanned_files_len;
126 - for (element = scanned_ini_list.head; element; element = element->next) {
127 - if (php_ini_scanned_files_len) {
128 - strlcat(php_ini_scanned_files, ",\n", total_l);
130 - strlcat(php_ini_scanned_files, *(char **)element->data, total_l);
131 - strlcat(php_ini_scanned_files, element->next ? ",\n" : "\n", total_l);
132 + ini_path = php_strtok_r(NULL, paths_separator, &last);
136 + int php_ini_scanned_files_len = (php_ini_scanned_files) ? strlen(php_ini_scanned_files) + 1 : 0;
137 + php_ini_scanned_files = (char *) realloc(php_ini_scanned_files, php_ini_scanned_files_len + total_l + 1);
138 + if (!php_ini_scanned_files_len) {
139 + *php_ini_scanned_files = '\0';
141 + total_l += php_ini_scanned_files_len;
142 + for (element = scanned_ini_list.head; element; element = element->next) {
143 + if (php_ini_scanned_files_len) {
144 + strlcat(php_ini_scanned_files, ",\n", total_l);
146 + strlcat(php_ini_scanned_files, *(char **)element->data, total_l);
147 + strlcat(php_ini_scanned_files, element->next ? ",\n" : "\n", total_l);
149 - zend_llist_destroy(&scanned_ini_list);
152 + zend_llist_destroy(&scanned_ini_list);
154 /* Make sure an empty php_ini_scanned_path ends up as NULL */
155 php_ini_scanned_path = NULL;