From: André Malo <nd@apache.org>
Date: Thu, 23 Oct 2003 20:17:27 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~1099
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4578ca4a26cef8457394e93af91669428ed3c705;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index e186910116..2909ba6502 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,10 +9,6 @@ Changes with Apache 2.1.0-dev
      logging hooks so that server-status will show 'L' for hung loggers
      instead of 'W'.  [Jeff Trawick]
 
-  *) mod_include: fix segfault which occured if the filename was not
-     set, for example, when processing some error conditions.
-     PR 23836.  [Brian Akins <bakins@web.turner.com>, André Malo]
-
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
@@ -214,6 +210,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) mod_include: fix segfault which occured if the filename was not
+     set, for example, when processing some error conditions.
+     PR 23836.  [Brian Akins <bakins@web.turner.com>, André Malo]
+
   *) fix the config parser to support <Foo>..</Foo> containers (no
      arguments in the opening tag) supported by httpd 1.3. Without
      this change mod_perl 2.0's <Perl> sections are broken.