- up to 5.2.7

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

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 8cf6922995a30f01b10e9011c80221df63108e36..b078e3ffa41cc8a04616d247b08f34420b361637 100644 (file)
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,14 +1,20 @@
---- 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.7/main/php_ini.c.org       2008-12-05 23:30:07.843241117 +0100
++++ php-5.2.7/main/php_ini.c   2008-12-05 23:36:18.096968965 +0100
+@@ -475,21 +475,32 @@
                        }
                }
+ 
+-              /* Otherwise search for php-%sapi-module-name%.ini file in search path */
 +              /* Search (global) php.ini file in search path */
-+              if (!fh.handle.fp) {
+               if (!fh.handle.fp) {
+-                      const char *fmt = "php-%s.ini";
+-                      char *ini_fname;
+-                      spprintf(&ini_fname, 0, fmt, sapi_module.name);
+-                      fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
+-                      efree(ini_fname);
 +                      fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
-+                      if (fh.handle.fp) {
-+                              fh.filename = php_ini_opened_path;
+                       if (fh.handle.fp) {
+                               fh.filename = php_ini_opened_path;
 +                              PG(safe_mode) = safe_mode_state;
 +                              PG(open_basedir) = open_basedir;
 +                              fh.type = ZEND_HANDLE_FP;
@@ -20,26 +26,24 @@
 +                              fh.handle.fp = NULL;
 +                              efree(php_ini_opened_path);
 +                              fh.filename = php_ini_opened_path = NULL;
-+                      }
-+              }
-               /* Search php-%sapi-module-name%.ini file in search path */
-               if (!fh.handle.fp) {
-                       const char *fmt = "php-%s.ini";
-@@ -363,11 +379,4 @@
                        }
                }
--              /* Search php.ini file in search path */
--              if (!fh.handle.fp) {
+ 
+-              /* If still no ini file found, search for php.ini file in search path */
++              /* Otherwise search for php-%sapi-module-name%.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) {
--                              fh.filename = php_ini_opened_path;
--                      }
--              }
-       }
-       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)) {
++                      const char *fmt = "php-%s.ini";
++                      char *ini_fname;
++                      spprintf(&ini_fname, 0, fmt, sapi_module.name);
++                      fh.handle.fp = php_fopen_with_path(ini_fname, "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
++                      efree(ini_fname);
+                       if (fh.handle.fp) {
+                               fh.filename = php_ini_opened_path;
+                       }
+@@ -533,9 +544,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,20 +51,19 @@
 +              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) {
 +                      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 @@
+@@ -564,6 +579,38 @@
                                free(namelist[i]);
                        }
                        free(namelist);
 +              }
-+
++              
 +              if ((ndir = php_scandir(sapi_scan_dir, &namelist, 0, php_alphasort)) > 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"))) {
@@ -87,8 +90,8 @@
 +                      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