Commit 19a1e90e authored by Jeff Trawick's avatar Jeff Trawick
Browse files

sync with 2.2.x branch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@483975 13f79535-47bb-0310-9956-ffa450edef68
parent c787a5b9
Loading
Loading
Loading
Loading
+3 −3
Changes for CHANGES: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ Changes with Apache 2.3.0
  *) mod_headers: support regexp-based editing of HTTP headers [Nick Kew]
  *) mod_cache: Eliminate a bogus error in the log when a filter returns
     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
  *) mod_disk_cache: Make caching of large files possible on 32bit machines
     by determining whether the cached file should be copied on disk rather
     than loaded into RAM. PR39380 [Niklas Edmundsson <nikke acc.umu.se>]
@@ -259,6 +256,9 @@ Changes with Apache 2.3.0
Changes with Apache 2.2.4
  *) mod_cache: Eliminate a bogus error in the log when a filter returns
     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
  *) Fix issue which could cause piped loggers to be orphaned and never
     terminate after a graceful restart.  PR 40651.  [Joe Orton,
     Ruediger Pluem]