From: Bill Stoddard <stoddard@apache.org>
Date: Thu, 30 Jan 2003 16:43:39 +0000 (+0000)
Subject: Note a couple of backports
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c492bfe37d0c6ea991253b3951362e9cc2dd06;p=thirdparty%2Fapache%2Fhttpd.git

Note a couple of backports


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

diff --git a/CHANGES b/CHANGES
index 2943013b426..a71d7122c83 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,8 +20,6 @@ Changes with Apache 2.1.0-dev
      triggering the 'no encoded slashes anywhere' legacy rule.
      PR 543, 2389, 3581, 3589, 5687, 7066, 7865, 14639.  [Ken Coar]
 
-  *) mod_file_cache: fixed a segfault when multiple MMapFile directives
-     were used.  PR 16313.  [Cliff Woolley]
 
   *) Move RFC 1413 ident requests from core to new module mod_ident.
      [André Malo]
@@ -72,6 +70,11 @@ Changes with Apache 2.1.0-dev
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
 Changes with Apache 2.0.45
+  *) mod_file_cache: fix segfault serving mmaped cached files.
+     [Bill Stoddard]
+
+  *) mod_file_cache: fixed a segfault when multiple MMapFile directives
+     were used.  PR 16313.  [Cliff Woolley]
 
   *) Fix a nasty segfault in mmap_bucket_setaside() caused by passing
      an incompatible pointer type to mmap_bucket_destroy(void*).