Search for php.ini in CWD in all sapi's *but* CLI.

This patch reverses wrong behavaiour introduced before the
release of 5.1.0.

# We should probably consider killing adding CWD php.ini lookup
# altogether.

diff --git a/main/php_ini.c b/main/php_ini.c
index 25fbe0f4878ff54b38eb4401c7dc2e40dae50544..92f2a4dda07ea216680e2e81806263ec7d7181a9 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -333,8 +333,8 @@ int php_init_config(TSRMLS_D)
                }
 #endif
 
-               /* Add cwd (only with CLI) */
-               if (strcmp(sapi_module.name, "cli") == 0) {
+               /* Add cwd (not with CLI) */
+               if (strcmp(sapi_module.name, "cli") != 0) {
                        if (*php_ini_search_path) {
                                strcat(php_ini_search_path, paths_separator);
                        }