cvs: php4 /main SAPI.h php_ini.c
| From: | Marcus Boerger | Date: | Tue, 18 Mar 2003 15:53:33 +0000 |
| Subject: | cvs: php4 /main SAPI.h php_ini.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19665@lists.php.net to get a copy of this message | ||
helly Tue Mar 18 10:53:33 2003 EDT
Modified files:
/php4/main php_ini.c SAPI.h
Log:
give sapi modules the possibility to overwrite default ini settings
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.117 php4/main/php_ini.c:1.118
--- php4/main/php_ini.c:1.117 Fri Feb 28 15:48:38 2003
+++ php4/main/php_ini.c Tue Mar 18 10:53:33 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.117 2003/02/28 20:48:38 rasmus Exp $ */
+/* $Id: php_ini.c,v 1.118 2003/03/18 15:53:33 helly Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -274,6 +274,10 @@
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);
}
zend_llist_init(&extension_lists.engine, sizeof(char *), (llist_dtor_func_t) free_estring, 1);
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.100 php4/main/SAPI.h:1.101
--- php4/main/SAPI.h:1.100 Thu Feb 20 17:21:48 2003
+++ php4/main/SAPI.h Tue Mar 18 10:53:33 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: SAPI.h,v 1.100 2003/02/20 22:21:48 rasmus Exp $ */
+/* $Id: SAPI.h,v 1.101 2003/03/18 15:53:33 helly Exp $ */
#ifndef SAPI_H
#define SAPI_H
@@ -241,6 +241,8 @@
int (*get_target_gid)(gid_t * TSRMLS_DC);
unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len TSRMLS_DC);
+
+ void (*ini_defaults)(HashTable *configuration_hash);
};