---- php-5.3.0/main/php_ini.c.org 2009-07-06 17:32:30.309904482 +0200
-+++ php-5.3.0/main/php_ini.c 2009-07-06 17:36:45.529879052 +0200
-@@ -620,12 +620,14 @@
+--- php-5.3.0/main/php_ini.c 2009-07-06 17:36:45.529879052 +0200
++++ php-5.3.2/main/php_ini.c 2010-03-17 17:55:16.800313459 +0200
+@@ -358,6 +358,11 @@
+ }
+ /* }}} */
+
++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)
+@@ -480,6 +485,24 @@
+ }
+ }
+ }
++ /* Search (global) 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;
++ PG(safe_mode) = safe_mode_state;
++ PG(open_basedir) = open_basedir;
++ fh.type = ZEND_HANDLE_FP;
++ zend_parse_ini_file(&fh, 1, ZEND_INI_SCANNER_NORMAL, (zend_ini_parser_cb_t) php_ini_parser_cb, &configuration_hash TSRMLS_CC);
++ safe_mode_state = PG(safe_mode);
++ open_basedir = PG(open_basedir);
++ PG(safe_mode) = 0;
++ PG(open_basedir) = NULL;
++ fh.handle.fp = NULL;
++ efree(php_ini_opened_path);
++ fh.filename = php_ini_opened_path = NULL;
++ }
++ }
+
+ /* Otherwise search for php-%sapi-module-name%.ini file in search path */
+ if (!fh.handle.fp) {
+@@ -492,14 +515,6 @@
+ fh.filename = php_ini_opened_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) {
+- fh.filename = php_ini_opened_path;
+- }
+- }
+ }
+
+ if (free_ini_search_path) {
+@@ -610,12 +625,14 @@
zend_llist scanned_ini_list;
zend_llist_element *element;
int l, total_l = 0;
ini_path = php_strtok_r(path_copy, paths_separator, &last);
while (ini_path != NULL) {
+@@ -636,7 +653,7 @@
+ struct dirent **namelist;
+ int ini_path_len = strlen(ini_path);
+
+- if ((ndir = php_scandir(ini_path, &namelist, 0, php_alphasort)) > 0) {
++ if ((ndir = php_scandir(ini_path, &namelist, 0, php_csort)) > 0) {
+ memset(&fh2, 0, sizeof(fh2));
+
+ for (i = 0; i < ndir; i++) {