X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=php-sapi-ini-file.patch;h=0c6abd696e1783c481b4165a4019ecd8ca622d73;hb=8cb93fd057b989458d7b32948a29aeb69f7ff369;hp=5047b0262ce6b78650335b3dfa9e48327d940e49;hpb=bb44e93fe117a35862d356c569bc9acfaf971213;p=packages%2Fphp.git

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 5047b02..0c6abd6 100644
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,6 +1,19 @@
---- php-5.0.4/main/php_ini.c.orig	2004-09-17 04:48:47.000000000 +0200
-+++ php-5.0.4/main/php_ini.c	2005-04-04 23:07:48.461211584 +0200
-@@ -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,14 +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";
-@@ -441,13 +459,6 @@
+@@ -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) {
@@ -39,3 +53,68 @@
  	}
  
  	if (free_ini_search_path) {
+@@ -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;
++		const char *fmt = PHP_CONFIG_FILE_PATH "/%s.d";
++		char *sapi_scan_dir = emalloc(strlen(fmt) + strlen(sapi_module.name));
++		sprintf(sapi_scan_dir, fmt, sapi_module.name);
+ 
+-		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"))) {
+@@ -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_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"))) {
++					free(namelist[i]);
++					continue;
++				}
++				snprintf(ini_file, MAXPATHLEN, "%s%c%s", sapi_scan_dir, DEFAULT_SLASH, namelist[i]->d_name);
++				if (VCWD_STAT(ini_file, &sb) == 0) {
++					if (S_ISREG(sb.st_mode)) {
++						if ((fh.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
++							fh.filename = ini_file;
++							fh.type = ZEND_HANDLE_FP;
++							zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
++							/* 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);
+ 						}
+@@ -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
+ 			 */