let apache modules use just major.minor for filename

[packages/php.git] / php-sapi-ini-file.patch

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 8cf6922995a30f01b10e9011c80221df63108e36..0c6abd696e1783c481b4165a4019ecd8ca622d73 100644 (file)
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,6 +1,19 @@
---- php-4.3.0/main/php_ini.c   Sat Jan  4 12:22:39 2003
-+++ php-4.4.2/main/php_ini.c   2006-04-04 18:50:17.756460517 +0300
-@@ -430,6 +430,24 @@
+--- php-5.2.11/main/php_ini.c  2009-09-24 22:48:12.128424374 +0300
++++ php-5.2.11/main/php_ini.c  2009-09-24 22:50:19.481745134 +0300
+@@ -255,6 +255,12 @@
+ }
+ /* }}} */
+ 
++static int php_csort(const struct dirent **a, const struct dirent **b)
++{
++      return strcmp((*a)->d_name,(*b)->d_name);
++}
++
++
+ /* {{{ php_init_config
+  */
+ int php_init_config(TSRMLS_D)
+@@ -474,6 +480,24 @@
                                }
                        }
                }
@@ -22,13 +35,15 @@
 +                              fh.filename = php_ini_opened_path = NULL;
 +                      }
 +              }
-               /* Search php-%sapi-module-name%.ini file in search path */
+ 
+               /* Otherwise search for php-%sapi-module-name%.ini file in search path */
                if (!fh.handle.fp) {
-                       const char *fmt = "php-%s.ini";
-@@ -363,11 +379,4 @@
+@@ -486,14 +510,6 @@
+                               fh.filename = php_ini_opened_path;
                        }
                }
--              /* Search php.ini file in search path */
+-
+-              /* If still no ini file found, search for php.ini file in search path */
 -              if (!fh.handle.fp) {
 -                      fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
 -                      if (fh.handle.fp) {
@@ -36,10 +51,11 @@
 -                      }
 -              }
        }
+ 
        if (free_ini_search_path) {
-@@ -431,9 +440,13 @@
-        * parse any .ini files found in this directory. */
-       if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+@@ -533,9 +549,13 @@
+       /* 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) {
                struct dirent **namelist;
 -              int ndir, i;
 +              int ndir, i, found = 0;
@@ -47,18 +63,27 @@
 +              char *sapi_scan_dir = emalloc(strlen(fmt) + strlen(sapi_module.name));
 +              sprintf(sapi_scan_dir, fmt, sapi_module.name);
  
-               if ((ndir = php_scandir(PHP_CONFIG_FILE_SCAN_DIR, &namelist, 0, php_alphasort)) > 0) {
+-              if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_alphasort)) > 0) {
++              if ((ndir = php_scandir(php_ini_scanned_path, &namelist, 0, php_csort)) > 0) {
 +                      found += ndir;
                        for (i = 0; i < ndir; i++) {
                                /* check for a .ini extension */
                                if (!(p = strrchr(namelist[i]->d_name, '.')) || (p && strcmp(p, ".ini"))) {
-@@ -458,7 +471,39 @@
-                               free(namelist[i]);
-                       }
-                       free(namelist);
+@@ -556,6 +576,35 @@
+                                                       /* Here, add it to the list of ini files read */
+                                                       l = strlen(ini_file);
+                                                       total_l += l + 2;
++                                                      p = estrndup(ini_file, l); 
++                                                      zend_llist_add_element(&scanned_ini_list, &p);
++                                              }
++                                      }
++                              }
++                              free(namelist[i]);
++                      }
++                      free(namelist);
 +              }
 +
-+              if ((ndir = php_scandir(sapi_scan_dir, &namelist, 0, php_alphasort)) > 0) {
++              if ((ndir = php_scandir(sapi_scan_dir, &namelist, 0, php_csort)) > 0) {
 +                      found += ndir;
 +
 +                      for (i = 0; i < ndir; i++) {
@@ -77,18 +102,19 @@
 +                                                      /* Here, add it to the list of ini files read */
 +                                                      l = strlen(ini_file);
 +                                                      total_l += l + 2;
-+                                                      p = estrndup(ini_file, l);
-+                                                      zend_llist_add_element(&scanned_ini_list, &p);
-+                                              }
-+                                      }
-+                              }
-+                              free(namelist[i]);
-+                      }
-+                      free(namelist);
+                                                       p = estrndup(ini_file, l);
+                                                       zend_llist_add_element(&scanned_ini_list, &p);
+                                               }
+@@ -564,8 +613,11 @@
+                               free(namelist[i]);
+                       }
+                       free(namelist);
 +              }
 +              efree(sapi_scan_dir);
  
+-                      /*
 +              if (found) {
-                       /* 
++                      /* 
                         * Don't need an extra byte for the \0 in this malloc as the last
                         * element will not get a trailing , which gives us the byte for the \0
+                        */