diff options
| author | Andi Gutmans <andi@php.net> | 1999-07-15 19:31:29 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-07-15 19:31:29 +0000 |
| commit | 527a7429bcec245bf37d7e37b7c0fdfbe86a4720 (patch) | |
| tree | ecef4e56a5ed3cf74dbf8531c84f9c22788ffe72 /mod_php4.c | |
| parent | eaebc48e5e4b2f18e5903f9a746e48af75aaa9a5 (diff) | |
| download | php-git-527a7429bcec245bf37d7e37b7c0fdfbe86a4720.tar.gz | |
*** empty log message ***
Diffstat (limited to 'mod_php4.c')
| -rw-r--r-- | mod_php4.c | 34 |
1 files changed, 18 insertions, 16 deletions
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; |