cvs: /php4 mod_php4.c

andi Thu Jul 15 15:31:30 1999 EDT Modified files: /php4 mod_php4.c Log: Index: php4/mod_php4.c diff -u php4/mod_php4.c:1.11 php4/mod_php4.c:1.12 --- php4/mod_php4.c:1.11 Thu Jul 15 15:26:25 1999 +++ php4/mod_php4.c Thu Jul 15 15:31:29 1999 @@ -28,7 +28,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.11 1999/07/15 19:26:25 andi Exp $ */ +/* $Id: mod_php4.c,v 1.12 1999/07/15 19:31:29 andi Exp $ */ #include "httpd.h" #include "http_config.h" @@ -391,18 +391,6 @@ #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_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); } @@ -455,6 +443,20 @@ return php_apache_value_handler_ex(cmd, conf, arg1, bool_val, mode); } + + +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)