fat Thu, 11 Nov 2010 17:24:27 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305276
Log: - Fixed #52045 (FPM tries to open php.ini from the current dir) - Add php_ini_ignore_cwd to _sapi_module_struct Bug: http://bugs.php.net/52045 (Assigned) FPM tries to open php.ini from the current dir Changed paths: U php/php-src/trunk/main/SAPI.h U php/php-src/trunk/main/php_ini.c U php/php-src/trunk/sapi/cli/php_cli.c U php/php-src/trunk/sapi/fpm/fpm/fpm_main.c Modified: php/php-src/trunk/main/SAPI.h =================================================================== --- php/php-src/trunk/main/SAPI.h 2010-11-11 13:03:16 UTC (rev 305275) +++ php/php-src/trunk/main/SAPI.h 2010-11-11 17:24:27 UTC (rev 305276) @@ -251,6 +251,7 @@ 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); Modified: php/php-src/trunk/main/php_ini.c =================================================================== --- php/php-src/trunk/main/php_ini.c 2010-11-11 13:03:16 UTC (rev 305275) +++ php/php-src/trunk/main/php_ini.c 2010-11-11 17:24:27 UTC (rev 305276) @@ -461,7 +461,7 @@ #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); } Modified: php/php-src/trunk/sapi/cli/php_cli.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli.c 2010-11-11 13:03:16 UTC (rev 305275) +++ php/php-src/trunk/sapi/cli/php_cli.c 2010-11-11 17:24:27 UTC (rev 305276) @@ -734,6 +734,7 @@ 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 Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c =================================================================== --- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-11-11 13:03:16 UTC (rev 305275) +++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c 2010-11-11 17:24:27 UTC (rev 305276) @@ -1566,6 +1566,7 @@ 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 */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
