cvs: php4(PHP_4_3) /main php_ini.c
| From: | Jani Taskinen | Date: | Mon, 03 Feb 2003 12:25:47 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18385@lists.php.net to get a copy of this message | ||
sniper Mon Feb 3 07:25:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php_ini.c
Log:
MFH: Fixed bug: #22011 (-n must ignore all ini files)
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106.2.4 php4/main/php_ini.c:1.106.2.5
--- php4/main/php_ini.c:1.106.2.4 Mon Jan 27 20:51:25 2003
+++ php4/main/php_ini.c Mon Feb 3 07:25:47 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.106.2.4 2003/01/28 01:51:25 iliaa Exp $ */
+/* $Id: php_ini.c,v 1.106.2.5 2003/02/03 12:25:47 sniper Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -400,7 +400,7 @@
/* If the config_file_scan_dir is set at compile-time, go and scan this directory and
* parse any .ini files found in this directory. */
- if(strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+ if (!sapi_module.php_ini_ignore && strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
struct dirent **namelist;
int ndir, i;