Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 7 Feb 2001 17:50:08 -0000
Message-ID: <20010207175008.12444.qmail@apache.org>
From: rbb@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/mappers mod_alias.c

rbb         01/02/07 09:50:08

  Modified:    .        CHANGES
               modules/mappers mod_alias.c
  Log:
  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
  
  Revision  Changes    Path
  1.78      +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -d -b -w -u -r1.77 -r1.78
  --- CHANGES	2001/02/06 22:49:44	1.77
  +++ CHANGES	2001/02/07 17:50:03	1.78
  @@ -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
  
  
  
  1.23      +1 -0      httpd-2.0/modules/mappers/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_alias.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -d -b -w -u -r1.22 -r1.23
  --- mod_alias.c	2001/01/19 07:04:22	1.22
  +++ mod_alias.c	2001/02/07 17:50:07	1.23
  @@ -145,6 +145,7 @@
   	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