cvs: php4 /sapi/apache2filter apache_config.c

iliaa Sat Nov 2 18:08:20 2002 EDT Modified files: /php4/sapi/apache2filter apache_config.c Log: Fixed bug #20217. When php_flag & php_value are used, the PHP_INI_PERDIR flag should be used when setting the ini value. Otherwise, the user cannot modify per-directory ini settings specified via .htaccess. Index: php4/sapi/apache2filter/apache_config.c diff -u php4/sapi/apache2filter/apache_config.c:1.26 php4/sapi/apache2filter/apache_config.c:1.27 --- php4/sapi/apache2filter/apache_config.c:1.26 Sat Nov 2 11:04:26 2002 +++ php4/sapi/apache2filter/apache_config.c Sat Nov 2 18:08:20 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: apache_config.c,v 1.26 2002/11/02 16:04:26 imajes Exp $ */ +/* $Id: apache_config.c,v 1.27 2002/11/02 23:08:20 iliaa Exp $ */ #include "php.h" #include "php_ini.h" @@ -76,7 +76,7 @@ static const char *php_apache_value_handler(cmd_parms *cmd, void *dummy, const char *name, const char *value) { - return real_value_hnd(cmd, dummy, name, value, PHP_INI_USER); + return real_value_hnd(cmd, dummy, name, value, PHP_INI_PERDIR); } static const char *php_apache_admin_value_handler(cmd_parms *cmd, void *dummy, @@ -103,7 +103,7 @@ static const char *php_apache_flag_handler(cmd_parms *cmd, void *dummy, const char *name, const char *value) { - return real_flag_hnd(cmd, dummy, name, value, PHP_INI_USER); + return real_flag_hnd(cmd, dummy, name, value, PHP_INI_PERDIR); } static const char *php_apache_admin_flag_handler(cmd_parms *cmd, void *dummy,