- updated

Changed files:
    php-config-file-scan-dir.patch -> 1.3

diff --git a/php-config-file-scan-dir.patch b/php-config-file-scan-dir.patch
index 8c1c85b0b3cf5a2898a5a09ef37eed30cd4756c6..0055352794330f283e6718b3d5ca0533216c597d 100644 (file)
--- a/php-config-file-scan-dir.patch
+++ b/php-config-file-scan-dir.patch
@@ -17,8 +17,8 @@
 -              static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
  #ifdef PHP_WIN32
                char *reg_location;
- #endif
-@@ -608,72 +608,83 @@
+               char phprc_path[MAXPATHLEN];
+@@ -608,72 +608,86 @@
  
        /* Scan and parse any .ini files found in scan path if path not empty. */
        if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
@@ -33,9 +33,6 @@
                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));
@@ -47,6 +44,9 @@
 -                                      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 {
@@ -84,6 +84,9 @@
 +                                              free(namelist[i]);
 +                                              continue;
 +                                      }
++                                      /* Reset active ini section */
++                                      RESET_ACTIVE_INI_HASH();
++
 +                                      if (IS_SLASH(ini_path[ini_path_len - 1])) {
 +                                              snprintf(ini_file, MAXPATHLEN, "%s%s", ini_path, namelist[i]->d_name);
 +                                      } else {