sniper Fri Sep 2 10:05:47 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.640.2.3&r2=1.640.2.4&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.3 php-src/main/main.c:1.640.2.4
--- php-src/main/main.c:1.640.2.3 Thu Sep 1 10:44:14 2005
+++ php-src/main/main.c Fri Sep 2 10:05:45 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.3 2005/09/01 14:44:14 sniper Exp $ */
+/* $Id: main.c,v 1.640.2.4 2005/09/02 14:05:45 sniper Exp $ */
/* {{{ includes
*/
@@ -1415,17 +1415,6 @@
le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index
pointer", 0);
- /* Initialize configuration_hash */
- if (php_init_config_hash() == FAILURE) {
- return FAILURE;
- }
-
- /* Register PHP core ini entries */
- REGISTER_INI_ENTRIES();
-
- /* 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 */
@@ -1433,6 +1422,12 @@
return FAILURE;
}
+ /* Register PHP core ini entries */
+ REGISTER_INI_ENTRIES();
+
+ /* Register Zend ini entries */
+ zend_register_standard_ini_entries(TSRMLS_C);
+
/* Disable realpath cache if safe_mode or open_basedir are set */
if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
CWDG(realpath_cache_size_limit) = 0;
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.136.2.2&r2=1.136.2.3&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.2 php-src/main/php_ini.c:1.136.2.3
--- php-src/main/php_ini.c:1.136.2.2 Fri Sep 2 04:24:14 2005
+++ php-src/main/php_ini.c Fri Sep 2 10:05:45 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.136.2.2 2005/09/02 08:24:14 sniper Exp $ */
+/* $Id: php_ini.c,v 1.136.2.3 2005/09/02 14:05:45 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.45.2.1&r2=1.45.2.2&ty=u
Index: php-src/main/php_ini.h
diff -u php-src/main/php_ini.h:1.45.2.1 php-src/main/php_ini.h:1.45.2.2
--- php-src/main/php_ini.h:1.45.2.1 Thu Sep 1 10:44:15 2005
+++ php-src/main/php_ini.h Fri Sep 2 10:05:46 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.h,v 1.45.2.1 2005/09/01 14:44:15 sniper Exp $ */
+/* $Id: php_ini.h,v 1.45.2.2 2005/09/02 14:05:46 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
