jon Mon Mar 15 02:45:27 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/standard info.c
Log:
Fixed crash in php_ini_scanned_files() when no additional INI files were
actually parsed.
I'll merge this into the PHP_4_3 branch as soon as I receive permission
from the release master.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1634&r2=1.1635&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1634 php-src/NEWS:1.1635
--- php-src/NEWS:1.1634 Mon Mar 15 00:53:51 2004
+++ php-src/NEWS Mon Mar 15 02:45:24 2004
@@ -34,6 +34,8 @@
- Methods that override parent methods are now subject to prototype checking,
and have to be compatible with the method they're overriding - this check is
disabled in compatibility mode. (Andi, Zeev)
+- Fixed crash in php_ini_scanned_files() when no additional INI files were
+ actually parsed. (Jon)
- Fixed bug in gdImageFilledRectangle in the bundled GD library, that required
x1 < x2 and y1 < y2 for coordinates. (Derick)
- Fixed crash with foreach() and temporary objects($obj->method()->a ...) where
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.242&r2=1.243&ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.242 php-src/ext/standard/info.c:1.243
--- php-src/ext/standard/info.c:1.242 Wed Feb 18 00:07:13 2004
+++ php-src/ext/standard/info.c Mon Mar 15 02:45:25 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.242 2004/02/18 05:07:13 pollita Exp $ */
+/* $Id: info.c,v 1.243 2004/03/15 07:45:25 jon Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1080,7 +1080,7 @@
Return comma-separated string of .ini files parsed from the additional ini dir */
PHP_FUNCTION(php_ini_scanned_files)
{
- if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+ if (strlen(PHP_CONFIG_FILE_SCAN_DIR) && php_ini_scanned_files) {
RETURN_STRING(php_ini_scanned_files, 1);
} else {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
