sniper Fri Sep 2 10:08:10 2005 EDT
Modified files:
/php-src/main main.c php_ini.c php_ini.h
Log:
revert
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.647&r2=1.648&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.647 php-src/main/main.c:1.648
--- php-src/main/main.c:1.647 Thu Sep 1 10:42:52 2005
+++ php-src/main/main.c Fri Sep 2 10:08:09 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.647 2005/09/01 14:42:52 sniper Exp $ */
+/* $Id: main.c,v 1.648 2005/09/02 14:08:09 sniper Exp $ */
/* {{{ includes
*/
@@ -1535,8 +1535,10 @@
le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index
pointer", 0);
- /* Initialize configuration_hash */
- if (php_init_config_hash() == FAILURE) {
+ /* this will read in php.ini, set up the configuration parameters,
+ load zend extensions and register php function extensions
+ to be loaded later */
+ if (php_init_config(TSRMLS_C) == FAILURE) {
return FAILURE;
}
@@ -1546,13 +1548,6 @@
/* Register Zend ini entries */
zend_register_standard_ini_entries(TSRMLS_C);
- /* this will read in php.ini, set up the configuration parameters,
- load zend extensions and register php function extensions
- to be loaded later */
- if (php_init_config(TSRMLS_C) == FAILURE) {
- return FAILURE;
- }
-
orig_unicode = UG(unicode);
UG(unicode) = 0;
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.138&r2=1.139&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.138 php-src/main/php_ini.c:1.139
--- php-src/main/php_ini.c:1.138 Fri Sep 2 04:26:05 2005
+++ php-src/main/php_ini.c Fri Sep 2 10:08:09 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.138 2005/09/02 08:26:05 sniper Exp $ */
+/* $Id: php_ini.c,v 1.139 2005/09/02 14:08:09 sniper Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -254,14 +254,6 @@
}
/* }}} */
-/* {{{ php_init_config_hash
- */
-int php_init_config_hash(void)
-{
- return zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1);
-}
-/* }}} */
-
/* {{{ php_init_config
*/
int php_init_config(TSRMLS_D)
@@ -278,6 +270,10 @@
int l, total_l=0;
zend_llist_element *element;
+ if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t)
pvalue_config_destructor, 1) == FAILURE) {
+ return FAILURE;
+ }
+
if (sapi_module.ini_defaults) {
sapi_module.ini_defaults(&configuration_hash);
}
http://cvs.php.net/diff.php/php-src/main/php_ini.h?r1=1.46&r2=1.47&ty=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.46 php-src/main/php_ini.h:1.47
--- php-src/main/php_ini.h:1.46 Thu Sep 1 10:42:54 2005
+++ php-src/main/php_ini.h Fri Sep 2 10:08:09 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.h,v 1.46 2005/09/01 14:42:54 sniper Exp $ */
+/* $Id: php_ini.h,v 1.47 2005/09/02 14:08:09 sniper Exp $ */
#ifndef PHP_INI_H
#define PHP_INI_H
@@ -24,7 +24,6 @@
#include "zend_ini.h"
BEGIN_EXTERN_C()
-int php_init_config_hash(void);
int php_init_config(TSRMLS_D);
int php_shutdown_config(void);
void php_ini_register_extensions(TSRMLS_D);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
