Looks like a good compromise. I'd argue the ini_get_all() addition is fine too.
It looks like you forgot the FE entry though.. -Hannes On Tue, Apr 15, 2008 at 10:43 AM, Jani Taskinen <[EMAIL PROTECTED]> wrote: > jani Tue Apr 15 08:43:48 2008 UTC > > Modified files: > /php-src/ext/standard basic_functions.c basic_functions.h > Log: > - Readd config_get_has(). No need to document, it is only available for > debug builds. > > > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.894&r2=1.895&diff_format=u > Index: php-src/ext/standard/basic_functions.c > diff -u php-src/ext/standard/basic_functions.c:1.894 > php-src/ext/standard/basic_functions.c:1.895 > --- php-src/ext/standard/basic_functions.c:1.894 Mon Apr 14 15:42:13 > 2008 > +++ php-src/ext/standard/basic_functions.c Tue Apr 15 08:43:48 2008 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: basic_functions.c,v 1.894 2008/04/14 15:42:13 bjori Exp $ */ > +/* $Id: basic_functions.c,v 1.895 2008/04/15 08:43:48 jani Exp $ */ > > #include "php.h" > #include "php_streams.h" > @@ -956,6 +956,12 @@ > ZEND_ARG_INFO(0, scanner_mode) > ZEND_END_ARG_INFO() > > +#if ZEND_DEBUG > +static > +ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0) > +ZEND_END_ARG_INFO() > +#endif > + > static > ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1) > ZEND_ARG_INFO(0, types) > @@ -6421,6 +6427,19 @@ > } > /* }}} */ > > +#if ZEND_DEBUG > +/* This function returns an array of ALL valid ini options with values and > + * is not the same as ini_get_all() which returns only registered ini > options. Only useful for devs to debug php.ini scanner/parser! */ > +PHP_FUNCTION(config_get_hash) /* {{{ */ > +{ > + HashTable *hash = php_ini_get_configuration_hash(); > + > + array_init(return_value); > + zend_hash_apply_with_arguments(hash, (apply_func_args_t) > add_config_entry_cb, 1, return_value TSRMLS_CC); > +} > +/* }}} */ > +#endif > + > static int copy_request_variable(void *pDest, int num_args, va_list args, > zend_hash_key *hash_key) /* {{{ */ > { > zval *prefix, new_key; > > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.162&r2=1.163&diff_format=u > Index: php-src/ext/standard/basic_functions.h > diff -u php-src/ext/standard/basic_functions.h:1.162 > php-src/ext/standard/basic_functions.h:1.163 > --- php-src/ext/standard/basic_functions.h:1.162 Mon Apr 7 10:39:43 > 2008 > +++ php-src/ext/standard/basic_functions.h Tue Apr 15 08:43:48 2008 > @@ -17,7 +17,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: basic_functions.h,v 1.162 2008/04/07 10:39:43 colder Exp $ */ > +/* $Id: basic_functions.h,v 1.163 2008/04/15 08:43:48 jani Exp $ */ > > #ifndef BASIC_FUNCTIONS_H > #define BASIC_FUNCTIONS_H > @@ -127,7 +127,9 @@ > > /* From the INI parser */ > PHP_FUNCTION(parse_ini_file); > +#if ZEND_DEBUG > PHP_FUNCTION(config_get_hash); > +#endif > > PHP_FUNCTION(str_rot13); > PHP_FUNCTION(stream_get_filters); > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
