From: Andi Gutmans Date: Thu, 15 Jul 1999 19:31:29 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: php-4.0b1~122 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=527a7429bcec245bf37d7e37b7c0fdfbe86a4720;p=php *** empty log message *** --- diff --git a/mod_php4.c b/mod_php4.c index 4354b62f9b..b6f52e7555 100644 --- a/mod_php4.c +++ b/mod_php4.c @@ -391,18 +391,6 @@ static void *php_merge_dir(pool *p, void *basev, void *addv) #define CONST_PREFIX #endif -CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) -{ - return php_apache_value_handler_ex(cmd, conf, arg1, arg2, PHP_INI_PERDIR); -} - - -CONST_PREFIX char *php_apache_admin_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) -{ - return php_apache_value_handler_ex(cmd, conf, arg1, arg2, PHP_INI_SYSTEM); -} - - CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode) { php_per_dir_entry per_dir_entry; @@ -430,15 +418,15 @@ CONST_PREFIX char *php_apache_value_handler_ex(cmd_parms *cmd, HashTable *conf, } -CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) +CONST_PREFIX char *php_apache_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) { - return php_apache_flag_handler_ex(cmd, conf, arg1, arg2, PHP_INI_PERDIR); + return php_apache_value_handler_ex(cmd, conf, arg1, arg2, PHP_INI_PERDIR); } -CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) +CONST_PREFIX char *php_apache_admin_value_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) { - return php_apache_flag_handler_ex(cmd, conf, arg1, arg2, PHP_INI_SYSTEM); + return php_apache_value_handler_ex(cmd, conf, arg1, arg2, PHP_INI_SYSTEM); } @@ -457,6 +445,20 @@ CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable *conf, c } +CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) +{ + return php_apache_flag_handler_ex(cmd, conf, arg1, arg2, PHP_INI_PERDIR); +} + + +CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, php_apache_info_struct *conf, char *arg1, char *arg2) +{ + return php_apache_flag_handler_ex(cmd, conf, arg1, arg2, PHP_INI_SYSTEM); +} + + + + int php_xbithack_handler(request_rec * r) { php_apache_info_struct *conf;