helly Sun Feb 3 14:35:59 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c basic_functions.h
/php-src/main php_ini.c php_ini.h
Log:
- MFH Rename dump_config_hash() to get_config_hash() as it doesn't dump
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.17&r2=1.725.2.31.2.64.2.18&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.17
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.18
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.17 Fri Feb 1
12:28:44 2008
+++ php-src/ext/standard/basic_functions.c Sun Feb 3 14:35:58 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.17 2008/02/01 12:28:44 felipe
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.18 2008/02/03 14:35:58 helly Exp
$ */
#include "php.h"
#include "php_streams.h"
@@ -944,11 +944,9 @@
ZEND_ARG_INFO(0, scanner_mode)
ZEND_END_ARG_INFO()
-#if ZEND_DEBUG
static
-ZEND_BEGIN_ARG_INFO(arginfo_dump_config_hash, 0)
+ZEND_BEGIN_ARG_INFO(arginfo_get_config_hash, 0)
ZEND_END_ARG_INFO()
-#endif
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
@@ -3403,9 +3401,7 @@
PHP_FE(connection_status,
arginfo_connection_status)
PHP_FE(ignore_user_abort,
arginfo_ignore_user_abort)
PHP_FE(parse_ini_file,
arginfo_parse_ini_file)
-#if ZEND_DEBUG
- PHP_FE(dump_config_hash,
arginfo_dump_config_hash)
-#endif
+ PHP_FE(get_config_hash,
arginfo_get_config_hash)
PHP_FE(is_uploaded_file,
arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,
arginfo_move_uploaded_file)
@@ -6233,18 +6229,16 @@
}
/* }}} */
-#if ZEND_DEBUG
-/* {{{ proto void dump_config_hash(void)
+/* {{{ proto array get_config_hash(void)
*/
-PHP_FUNCTION(dump_config_hash)
+PHP_FUNCTION(get_config_hash)
{
- HashTable hash = get_configuration_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);
+ 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) /* {{{ */
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.139.2.4.2.6.2.4&r2=1.139.2.4.2.6.2.5&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.139.2.4.2.6.2.4
php-src/ext/standard/basic_functions.h:1.139.2.4.2.6.2.5
--- php-src/ext/standard/basic_functions.h:1.139.2.4.2.6.2.4 Mon Dec 31
07:17:14 2007
+++ php-src/ext/standard/basic_functions.h Sun Feb 3 14:35:59 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.139.2.4.2.6.2.4 2007/12/31 07:17:14 sebastian
Exp $ */
+/* $Id: basic_functions.h,v 1.139.2.4.2.6.2.5 2008/02/03 14:35:59 helly Exp $
*/
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -125,9 +125,7 @@
/* From the INI parser */
PHP_FUNCTION(parse_ini_file);
-#if ZEND_DEBUG
PHP_FUNCTION(dump_config_hash);
-#endif
PHP_FUNCTION(str_rot13);
PHP_FUNCTION(stream_get_filters);
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.15.2.6&r2=1.136.2.4.2.15.2.7&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.6
php-src/main/php_ini.c:1.136.2.4.2.15.2.7
--- php-src/main/php_ini.c:1.136.2.4.2.15.2.6 Mon Dec 31 07:17:17 2007
+++ php-src/main/php_ini.c Sun Feb 3 14:35:59 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.15.2.6 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.15.2.7 2008/02/03 14:35:59 helly Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -840,13 +840,10 @@
}
/* }}} */
-#if ZEND_DEBUG
-#include "php_ini.h"
-PHPAPI HashTable get_configuration_hash(void)
+PHPAPI HashTable* php_ini_get_configuration_hash(void) /* {{{ */
{
- return configuration_hash;
-}
-#endif
+ return &configuration_hash;
+} /* }}} */
/*
* Local variables:
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.h?r1=1.45.2.3.2.3.2.4&r2=1.45.2.3.2.3.2.5&diff_format=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.45.2.3.2.3.2.4
php-src/main/php_ini.h:1.45.2.3.2.3.2.5
--- php-src/main/php_ini.h:1.45.2.3.2.3.2.4 Mon Dec 31 07:17:17 2007
+++ php-src/main/php_ini.h Sun Feb 3 14:35:59 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.h,v 1.45.2.3.2.3.2.4 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: php_ini.h,v 1.45.2.3.2.3.2.5 2008/02/03 14:35:59 helly Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -36,9 +36,7 @@
PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type,
int stage TSRMLS_DC);
PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len
TSRMLS_DC);
PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len
TSRMLS_DC);
-#if ZEND_DEBUG
-PHPAPI HashTable get_configuration_hash(void);
-#endif
+PHPAPI HashTable* php_in_get_configuration_hash(void);
END_EXTERN_C()
#define PHP_INI_USER ZEND_INI_USER
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
