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.

diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c
index 1b4c1bc1ee3cf1269dccb9d8c97aafe08af01902..aad4fdef6409db80fa9d71d3c4ddece85148a849 100644 (file)
--- a/sapi/apache2filter/apache_config.c
+++ b/sapi/apache2filter/apache_config.c
@@ -76,7 +76,7 @@ static const char *real_value_hnd(cmd_parms *cmd, void *dummy,
 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 *real_flag_hnd(cmd_parms *cmd, void *dummy, const char *arg1,
 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,