From: Edin Kadribasic <edink@php.net>
Date: Tue, 5 Sep 2006 11:54:15 +0000 (+0000)
Subject: Search for php.ini in CWD in all sapi's *but* CLI.
X-Git-Tag: php-5.2.0RC4~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef058cdd9a08c98d0d40ed0f987eec8bc2be9308;p=php

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 25fbe0f487..92f2a4dda0 100644
--- 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);
 			}