packages (PHP_5_2): php/php-sapi-ini-file.patch - sort files using C locale...

[glen]

Author: glen                         Date: Thu Sep 24 20:02:30 2009 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- sort files using C locale in /etc/php/conf.d

---- Files affected:
packages/php:
   php-sapi-ini-file.patch (1.9 -> 1.9.4.1) 

---- Diffs:

================================================================
Index: packages/php/php-sapi-ini-file.patch
diff -u packages/php/php-sapi-ini-file.patch:1.9 packages/php/php-sapi-ini-file.patch:1.9.4.1
--- packages/php/php-sapi-ini-file.patch:1.9	Sat Dec  6 04:00:58 2008
+++ packages/php/php-sapi-ini-file.patch	Thu Sep 24 22:02:25 2009
@@ -1,6 +1,19 @@
---- php-5.2.7/main/php_ini.c	2008-08-14 19:34:30.000000000 +0300
-+++ php-5.2.7-inidir/main/php_ini.c	2008-12-05 12:53:24.747685251 +0200
-@@ -474,6 +474,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 @@
  				}
  			}
  		}
@@ -25,7 +38,7 @@
  
  		/* Otherwise search for php-%sapi-module-name%.ini file in search path */
  		if (!fh.handle.fp) {
-@@ -486,14 +504,6 @@
+@@ -486,14 +510,6 @@
  				fh.filename = php_ini_opened_path;
  			}
  		}
@@ -40,7 +53,7 @@
  	}
  
  	if (free_ini_search_path) {
-@@ -533,9 +543,13 @@
+@@ -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;
@@ -50,12 +63,13 @@
 +		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_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 +570,35 @@
+@@ -556,6 +576,35 @@
  							/* Here, add it to the list of ini files read */
  							l = strlen(ini_file);
  							total_l += l + 2;
@@ -69,7 +83,7 @@
 +			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++) {
@@ -91,7 +105,7 @@
  							p = estrndup(ini_file, l);
  							zend_llist_add_element(&scanned_ini_list, &p);
  						}
-@@ -564,8 +607,11 @@
+@@ -564,8 +613,11 @@
  				free(namelist[i]);
  			}
  			free(namelist);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-sapi-ini-file.patch?r1=1.9&r2=1.9.4.1&f=u