SOURCES: php4-sapi-ini-file.patch - search additionally for .ini f...

[glen]

Author: glen                         Date: Tue Apr  4 15:52:28 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- search additionally for .ini files from PHP_CONFIG_FILE_PATH/SAPI.d directory

---- Files affected:
SOURCES:
   php4-sapi-ini-file.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/php4-sapi-ini-file.patch
diff -u SOURCES/php4-sapi-ini-file.patch:1.4 SOURCES/php4-sapi-ini-file.patch:1.5
--- SOURCES/php4-sapi-ini-file.patch:1.4	Wed Jan  8 11:02:27 2003
+++ SOURCES/php4-sapi-ini-file.patch	Tue Apr  4 17:52:23 2006
@@ -1,5 +1,5 @@
---- php-4.3.0/main/php_ini.c.orig	Tue Nov 12 21:56:47 2002
-+++ php-4.3.0/main/php_ini.c	Sat Jan  4 12:22:39 2003
+--- 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
 @@ -351,6 +351,22 @@
  				}
  			}
@@ -23,17 +23,70 @@
  		/* Search php-%sapi-module-name%.ini file in search path */
  		if (!fh.handle.fp) {
  			const char *fmt = "php-%s.ini";
-@@ -361,13 +377,6 @@
- 			if (fh.handle.fp) {
- 				fh.filename = php_ini_opened_path;
+@@ -363,11 +379,4 @@
  			}
--		}
+ 		}
 -		/* Search 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) {
 -				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)) {
+ 		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_CONFIG_FILE_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"))) {
+@@ -458,7 +471,39 @@
+ 				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"))) {
++					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);
++						}
++					}
++				}
++				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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php4-sapi-ini-file.patch?r1=1.4&r2=1.5&f=u