php.net | support | documentation | report a bug | advanced search | search howto | statistics | random bug | login | |
Patch php_main_php_ini.c-fpm-cgi.patch for FPM related Bug #52045Patch version 2010-08-20 16:45 UTC Return to Bug #52045 | Download this patchThis patch is obsolete Obsoleted by patches: This patch renders other patches obsolete Obsolete patches: Patch Revisions: 2010-08-20 16:45 UTC | 2010-07-23 11:36 UTC | 2010-06-11 12:10 UTCDeveloper: fat@php.netIndex: main/php_ini.c Index: sapi/fpm/fpm/fpm_main.c =================================================================== --- main/php_ini.c (r�vision 300375) --- sapi/fpm/fpm/fpm_main.c (r�vision 302564) +++ sapi/fpm/fpm/fpm_main.c (copie de travail) @@ -1567,6 +1567,7 @@ sapi_startup(&cgi_sapi_module); cgi_sapi_module.php_ini_path_override = NULL; + cgi_sapi_module.php_ini_ignore_dot = 1; #ifdef PHP_WIN32 _fmode = _O_BINARY; /* sets default for file streams to binary */ Index: sapi/cli/php_cli.c =================================================================== --- sapi/cli/php_cli.c (r�vision 302564) +++ sapi/cli/php_cli.c (copie de travail) @@ -733,6 +733,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_dot = 1; sapi_startup(&cli_sapi_module); #ifdef PHP_WIN32 Index: main/php_ini.c =================================================================== --- main/php_ini.c (r�vision 302564) +++ main/php_ini.c (copie de travail) @@ -434,7 +434,8 @@ @@ -434,7 +434,7 @@ #endif /* Add cwd (not with CLI) */ - if (strcmp(sapi_module.name, "cli") != 0) { + if (strcmp(sapi_module.name, "cli") && + strcmp(sapi_module.name, "fpm-fcgi") != 0) { + if (!sapi_module.php_ini_ignore_dot) { if (*php_ini_search_path) { strlcat(php_ini_search_path, paths_separator, search_path_size); } Index: main/SAPI.h =================================================================== --- main/SAPI.h (r�vision 302564) +++ main/SAPI.h (copie de travail) @@ -251,6 +251,7 @@ char *executable_location; int php_ini_ignore; + int php_ini_ignore_dot; /* ignore the php.ini in the current dir if present */ int (*get_fd)(int *fd TSRMLS_DC); |
Copyright © 2001-2024 The PHP Group All rights reserved. |
Last updated: Wed Dec 04 21:01:29 2024 UTC |