cvs: php4(PHP_4_3) /main php_ini.c
| From: | Rasmus Lerdorf | Date: | Fri, 28 Feb 2003 20:44:47 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19281@lists.php.net to get a copy of this message | ||
rasmus Fri Feb 28 15:44:47 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php_ini.c
Log:
@- Crash bug fix. If config-file-scan-dir is set and contains .ini files
but there is no top php.ini file, we would get a segfault. (Rasmus)
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106.2.6 php4/main/php_ini.c:1.106.2.7
--- php4/main/php_ini.c:1.106.2.6 Wed Feb 19 04:28:37 2003
+++ php4/main/php_ini.c Fri Feb 28 15:44:47 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.106.2.6 2003/02/19 09:28:37 sniper Exp $ */
+/* $Id: php_ini.c,v 1.106.2.7 2003/02/28 20:44:47 rasmus Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -415,6 +415,7 @@
if (S_ISREG(sb.st_mode)) {
if ((fh.handle.fp = VCWD_FOPEN(ini_file, "r"))) {
fh.filename = ini_file;
+ fh.type = ZEND_HANDLE_FP;
zend_parse_ini_file(&fh, 1, php_config_ini_parser_cb, &extension_lists);
/* Here, add it to the list of ini files read */
l = strlen(ini_file);