mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,

[apache] / server / core.c

diff --git a/server/core.c b/server/core.c
index 169dd5c7bb860b7c8d3e72381135ce2a8fd7d009..8540d225f99e1a136511e13224252c8b9c6b3a25 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -1312,7 +1312,10 @@ AP_DECLARE(const char *) ap_check_cmd_context(cmd_parms *cmd,
                 || (found = find_parent(cmd->directive, "<FilesMatch"))
                 || (found = find_parent(cmd->directive, "<If"))
                 || (found = find_parent(cmd->directive, "<ElseIf"))
-                || (found = find_parent(cmd->directive, "<Else"))))) {
+                || (found = find_parent(cmd->directive, "<Else"))))
+        || ((forbidden & NOT_IN_PROXY)
+            && ((found = find_parent(cmd->directive, "<Proxy"))
+                || (found = find_parent(cmd->directive, "<ProxyMatch"))))) {
         return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
                            " cannot occur within ", found->directive,
                            "> section", NULL);