From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Wed, 21 May 2003 04:49:39 +0000 (+0000)
Subject: Move backported patches to 2.0.46 list.
X-Git-Tag: pre_ajp_proxy~1640
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1891a072e1449244e0e13e4914c19f64f19dc6e;p=thirdparty%2Fapache%2Fhttpd.git

Move backported patches to 2.0.46 list.


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

diff --git a/CHANGES b/CHANGES
index cca485cd159..b5e694dff58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,8 +6,6 @@ Changes with Apache 2.1.0-dev
      when a MKACTIVITY request comes in.
      [Ben Collins-Sussman <sussman@apache.org>]
 
-  *) configure.in: Play nice with libtool-1.5. [Wilfredo Sanchez]
-
   *) Prevent the server from crashing when entering infinite loops. The
      new LimitInternalRecursion directive configures limits of subsequent
      internal redirects and nested subrequests, after which the request
@@ -46,15 +44,11 @@ Changes with Apache 2.1.0-dev
      PR 11310. [Geoff Thrope <geoff@geoffthorpe.net>]
 
   *) Modify APACHE_CHECK_SSL_TOOLKIT to detect SSL-C. [Madhusudan Mathihalli]
-     
+
   *) Replace the APACHE_CHECK_SSL_TOOLKIT method with a cleaner one, using
      autoconf tools (AC_CHECK_HEADER, AC_CHECK_LIB etc). 
      [Geoff Thorpe <geoff@geoffthorpe.net>]
 
-  *) ssl session caching(shmht) : Fix a SEGV problem with SHMHT session
-     caching. PR 17864.
-     [Andreas Leimbacher <andreasl67@yahoo.de>, Madhusudan Mathihalli]
-
   *) change directive name from 'compressionlevel' to 'deflatecompressionlevel'
      [Ian Holsman, André Malo]
 
@@ -77,9 +71,6 @@ Changes with Apache 2.1.0-dev
   *) Return 413 if chunk-ext-header is too long rather than reading from
      the truncated line.  PR 15857.  [Justin Erenkrantz]
 
-  *) If mod_mime_magic does not know the content-type, do not attempt to
-     guess.  PR 16908.  [Andrew Gapon <agapon@telcordia.com>]
-
   *) Allow restart of httpd to occur even with syntax errors in the config
      file.  PR 16813.  [Justin Erenkrantz]
 
@@ -151,6 +142,15 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) configure.in: Play nice with libtool-1.5. [Wilfredo Sanchez]
+
+  *) If mod_mime_magic does not know the content-type, do not attempt to
+     guess.  PR 16908.  [Andrew Gapon <agapon@telcordia.com>]
+
+  *) ssl session caching(shmht) : Fix a SEGV problem with SHMHT session
+     caching. PR 17864.
+     [Andreas Leimbacher <andreasl67@yahoo.de>, Madhusudan Mathihalli]
+
   *) Add a delete flag to htpasswd.
      [Thom May]