- Fixed #52045 (FPM tries to open php.ini from the current dir)

- Add php_ini_ignore_cwd to _sapi_module_struct

diff --git a/main/SAPI.h b/main/SAPI.h
index 9513a45bfb1350aabab61aa2cd193ddf2878922e..1f2e361a6ea21e6d0310e5f1a90f6f7ad9528340 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -251,6 +251,7 @@ struct _sapi_module_struct {
        char *executable_location;
 
        int php_ini_ignore;
+       int php_ini_ignore_cwd; /* don't look for php.ini in the current directory */
 
        int (*get_fd)(int *fd TSRMLS_DC);
 

diff --git a/main/php_ini.c b/main/php_ini.c
index cbbf6dc41dedafd3a5e4825904912e240c314ae6..841008f724134c4b45ff43110ff09fe41ece68bc 100644 (file)
--- 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);
                        }

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 8936b2aebe350490fcc82a012aa8b8288a2fdbba..f784cc8c6453722492c3c3479a95473be3cac0a7 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -734,6 +734,7 @@ int main(int argc, char *argv[])
        cli_sapi_module.ini_defaults = sapi_cli_ini_defaults;
        cli_sapi_module.php_ini_path_override = NULL;
        cli_sapi_module.phpinfo_as_text = 1;
+       cli_sapi_module.php_ini_ignore_cwd = 1;
        sapi_startup(&cli_sapi_module);
 
 #ifdef PHP_WIN32

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 7f20ced9c57033e270ac682ee90459858f9b2d52..81c494c4a3d80135779210781b2dae89fb3e1878 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1566,6 +1566,7 @@ int main(int argc, char *argv[])
 
        sapi_startup(&cgi_sapi_module);
        cgi_sapi_module.php_ini_path_override = NULL;
+       cgi_sapi_module.php_ini_ignore_cwd = 1;
 
 #ifdef PHP_WIN32
        _fmode = _O_BINARY; /* sets default for file streams to binary */