Fix a bug with AliasMatch. When forward fitting a bug from 1.3 to 2.0, we

forgot a single line which broke this option.
PR:	6881

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

diff --git a/CHANGES b/CHANGES
index 7ceef106ff1a0a028be184eb6ee37af4ea24edc3..e8db60183246b366f1359aaaaa49abc5e037ad8d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0b1
 
+  *) Fix the AliasMatch directive in Apache 2.0.  When we brought a patch
+     forward from 1.3 to 2.0, we missed a single line, which broke regex
+     aliases.  [Ryan Bloom]
+
   *) We have a poor abstraction in the protocol.  This is a temporary
      hack to fix the bug, but it will need to be fixed for real.  If
      we find an error while sending out a custom error response, we back

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index c9b11c65221ebce3a59cc4e8879066624213746d..e9e904927b0e9797f52b389fd3c7283a0f7b18de 100644 (file)
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -145,6 +145,7 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy,
        new->regexp = ap_pregcomp(cmd->pool, f, REG_EXTENDED);
        if (new->regexp == NULL)
            return "Regular expression could not be compiled.";
+        new->real = r;
     }
 #ifndef OS2
     else