From: André Malo <nd@apache.org>
Date: Sat, 28 Feb 2004 22:59:23 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~606
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf14ebbf81d2b0edb4e4a6649d4b61b7c759fc20;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index 6eee255c56..6948791900 100644
--- a/CHANGES
+++ b/CHANGES
@@ -125,9 +125,6 @@ Changes with Apache 2.1.0-dev
 
   *) Switch to APR 1.0 API.
 
-  *) Fix mod_include's expression parser to recognize strings correctly
-     even if they start with an escaped token.  [André Malo]
-
   *) Major overhaul of mod_include's filter parser. The new parser code
      is expected to be more robust and should catch all of the edge cases
      that were not handled by the previous one. This includes a binary
@@ -280,6 +277,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Fix mod_include's expression parser to recognize strings correctly
+     even if they start with an escaped token.  [André Malo]
+
   *) Add fatal exception hook for use by diagnostic modules.  The hook
      is only available if the --enable-exception-hook configure parm 
      is used and the EnableExceptionHook directive has been set to