From e1b87cce1f9ca39dc9191f5335da2d49db0db083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Loyet?= Date: Thu, 11 Nov 2010 17:24:27 +0000 Subject: - Fixed #52045 (FPM tries to open php.ini from the current dir) - Add php_ini_ignore_cwd to _sapi_module_struct --- main/php_ini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_ini.c') diff --git a/main/php_ini.c b/main/php_ini.c index cbbf6dc41d..841008f724 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -461,7 +461,7 @@ int php_init_config(TSRMLS_D) #endif /* Add cwd (not with CLI) */ - if (strcmp(sapi_module.name, "cli") != 0) { + if (!sapi_module.php_ini_ignore_cwd) { if (*php_ini_search_path) { strlcat(php_ini_search_path, paths_separator, search_path_size); } -- cgit v1.2.1