From: Graham Leggett <minfrin@apache.org>
Date: Tue, 21 Dec 2010 20:00:38 +0000 (+0000)
Subject: The alias_set variable is set when a parent location contains a ProxyPass,
X-Git-Tag: 2.3.11~354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d37c924b9d8eecc236bdb89da95a39c29dc5a9d5;p=apache

The alias_set variable is set when a parent location contains a ProxyPass,
so this check catches valid ProxyPasses. Remove the check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1051628 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index dc66bb7dd3..337c63de70 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1417,9 +1417,6 @@ static const char *
 
     /* if per directory, save away the single alias */
     if (cmd->path) {
-        if (dconf->alias_set) {
-            return "ProxyPass may be defined just once within a specific location block";
-        }
         dconf->alias = apr_pcalloc(cmd->pool, sizeof(struct proxy_alias));
         dconf->alias_set = 1;
         new = dconf->alias;