From: Sander Roobol <sander@php.net>
Date: Sat, 22 Jun 2002 15:31:44 +0000 (+0000)
Subject: Made php_admin_value work outside <location> and <directory> blocks.
X-Git-Tag: php-4.3.0dev_zend2_alpha2~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d279a9224232674a969ba35ae34f75c4bb48c7ab;p=php

Made php_admin_value work outside <location> and <directory> blocks.
---

diff --git a/sapi/apache2filter/apache_config.c b/sapi/apache2filter/apache_config.c
index 90a544415f..96b27ddbf2 100644
--- a/sapi/apache2filter/apache_config.c
+++ b/sapi/apache2filter/apache_config.c
@@ -165,9 +165,9 @@ const command_rec php_dir_cmds[] =
                   "PHP Value Modifier"),
 	AP_INIT_TAKE2("php_flag", php_apache_flag_handler, NULL, OR_OPTIONS,
                   "PHP Flag Modifier"),
-	AP_INIT_TAKE2("php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF,
+	AP_INIT_TAKE2("php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF,
                   "PHP Value Modifier (Admin)"),
-	AP_INIT_TAKE2("php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF,
+	AP_INIT_TAKE2("php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF,
                   "PHP Flag Modifier (Admin)"),
 	AP_INIT_TAKE1("PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF,
                   "Directory containing the php.ini file"),