rasmus Sun Oct 6 13:04:11 2002 EDT
Modified files:
/php4 run-tests.php
/php4/ext/standard basic_functions.c info.c info.h
Log:
Add php_ini_scanned_files() so "make test" can tell you when you have
additional .ini files that are scanned.
Index: php4/run-tests.php
diff -u php4/run-tests.php:1.59 php4/run-tests.php:1.60
--- php4/run-tests.php:1.59 Fri Oct 4 17:19:51 2002
+++ php4/run-tests.php Sun Oct 6 13:04:10 2002
@@ -97,6 +97,7 @@
PHP_OS : " . PHP_OS . "
INI actual : " . realpath(get_cfg_var('cfg_file_path')) . "
INI wanted : " . realpath('php.ini-dist') . "
+More .INIs : " . str_replace("\n","", php_ini_scanned_files()) . "
=====================================================================
";
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.527
php4/ext/standard/basic_functions.c:1.528
--- php4/ext/standard/basic_functions.c:1.527 Sun Oct 6 13:00:33 2002
+++ php4/ext/standard/basic_functions.c Sun Oct 6 13:04:10 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.527 2002/10/06 17:00:33 sander Exp $ */
+/* $Id: basic_functions.c,v 1.528 2002/10/06 17:04:10 rasmus Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -309,6 +309,7 @@
PHP_FE(zend_logo_guid,
NULL)
PHP_FE(php_sapi_name,
NULL)
PHP_FE(php_uname,
NULL)
+ PHP_FE(php_ini_scanned_files,
+ NULL)
PHP_FE(strnatcmp,
NULL)
PHP_FE(strnatcasecmp,
NULL)
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.213 php4/ext/standard/info.c:1.214
--- php4/ext/standard/info.c:1.213 Sat Oct 5 06:58:55 2002
+++ php4/ext/standard/info.c Sun Oct 6 13:04:10 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.213 2002/10/05 10:58:55 wez Exp $ */
+/* $Id: info.c,v 1.214 2002/10/06 17:04:10 rasmus Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -909,6 +909,15 @@
RETURN_STRING(php_get_uname(*mode), 0);
}
+/* }}} */
+
+/* {{{ proto string php_ini_scanned_files(void)
+ 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)) {
+ RETURN_STRING(php_ini_scanned_files,1);
+ } else RETURN_FALSE;
+}
/* }}} */
/*
Index: php4/ext/standard/info.h
diff -u php4/ext/standard/info.h:1.28 php4/ext/standard/info.h:1.29
--- php4/ext/standard/info.h:1.28 Thu Sep 26 15:48:56 2002
+++ php4/ext/standard/info.h Sun Oct 6 13:04:10 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.h,v 1.28 2002/09/26 19:48:56 sebastian Exp $ */
+/* $Id: info.h,v 1.29 2002/10/06 17:04:10 rasmus Exp $ */
#ifndef INFO_H
#define INFO_H
@@ -63,6 +63,7 @@
PHP_FUNCTION(php_egg_logo_guid);
PHP_FUNCTION(php_sapi_name);
PHP_FUNCTION(php_uname);
+PHP_FUNCTION(php_ini_scanned_files);
PHPAPI char *php_info_html_esc(char *string TSRMLS_DC);
PHPAPI void php_print_info_htmlhead(TSRMLS_D);
PHPAPI void php_print_info(int flag TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
