REALLY sync with APACHE_2_0_BRANCH

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

1 files changed, 25 insertions, 21 deletions

diff --git a/CHANGES b/CHANGES
index 118687ea58..0cd6fad7af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,12 +19,6 @@ Changes with Apache 2.1.0-dev
 
   *) Switch to APR 1.0 API.
 
-  *) Modify ap_get_client_block() to note if it has seen EOS.
-     [Justin Erenkrantz]
-
-  *) The bucket brigades subsystem now honors the MaxMemFree setting.
-     [Cliff Woolley, Jean-Jacques Clar]
-
   *) Fix mod_include's expression parser to recognize strings correctly
      even if they start with an escaped token.  [André Malo]
 
@@ -39,10 +33,6 @@ Changes with Apache 2.1.0-dev
   *) mod_log_config: Fix %b log format to write really "-" when 0 bytes
      were sent (e.g. with 304 or 204 response codes).  [Astrid Keßler]
 
-  *) Fix a bug, where mod_deflate sometimes unconditionally compressed the
-     content if the Accept-Encoding header contained only other tokens than
-     "gzip" (such as "deflate"). PR 21523.  [Joe Orton, André Malo]
-
   *) mod_rewrite: Catch an edge case, where strange subsequent RewriteRules
      could lead to a 400 (Bad Request) response.  [André Malo]
 
@@ -60,15 +50,6 @@ Changes with Apache 2.1.0-dev
      the ENGINE functions but the engine header files are missing.
      [Cliff Woolley]
 
-  *) Fix mod_deflate so that it does not call deflate() without checking
-     first whether it has something to deflate. (Currently this causes
-     deflate to generate a fatal error according to the zlib spec.)
-     PR 22259. [Stas Bekman]
-
-  *) Avoid an infinite recursion, which occured if the name of an included
-     config file or directory contained a wildcard character. PR 22194.
-     [André Malo]
-
   *) mod_dav: Use bucket brigades when reading PUT data. This avoids
      problems if the data stream is modified by an input filter. PR 22104.
      [Tim Robbins <tim@robbins.dropbear.id.au>, André Malo]
@@ -252,6 +233,17 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) Modify ap_get_client_block() to note if it has seen EOS.
+     [Justin Erenkrantz]
+
+  *) Fix a bug, where mod_deflate sometimes unconditionally compressed the
+     content if the Accept-Encoding header contained only other tokens than
+     "gzip" (such as "deflate"). PR 21523.  [Joe Orton, André Malo]
+
+  *) Avoid an infinite recursion, which occured if the name of an included
+     config file or directory contained a wildcard character. PR 22194.
+     [André Malo]
+
   *) mod_ssl: Fix a problem setting variables that represent the
      client certificate chain.  PR 21371  [Jeff Trawick]
 
@@ -269,9 +261,21 @@ Changes with Apache 2.0.48
      to debug, as it is of interest only to developers.  PR 9011
      [Jeff Trawick]
 
+  *) MPMs: The bucket brigades subsystem now honors the MaxMemFree setting.
+     [Cliff Woolley, Jean-Jacques Clar]
+
   *) Install config.nice into the build/ directory to make
      minor version upgrades easier. [Joshua Slive]
 
+  *) Fix mod_deflate so that it does not call deflate() without checking
+     first whether it has something to deflate. (Currently this causes
+     deflate to generate a fatal error according to the zlib spec.)
+     PR 22259. [Stas Bekman]
+
+  *) mod_ssl: Fix FakeBasicAuth for subrequest.  Log an error when an
+     identity spoof is encountered.
+     [Sander Striker]
+
   *) mod_rewrite: Ignore RewriteRules in .htaccess files if the directory
      containing the .htaccess file is requested without a trailing slash.
      PR 20195.  [André Malo]
@@ -303,7 +307,7 @@ Changes with Apache 2.0.48
 
   *) Update the header token parsing code to allow LWS between the
      token word and the ':' seperator.  [PR 16520]
-     [Kris Verbeeck <kris.verbeeck@advalvas.be>,Nicel KM <mnicel@yahoo.com>]
+     [Kris Verbeeck <kris.verbeeck@advalvas.be>, Nicel KM <mnicel@yahoo.com>]
 
   *) Eliminate creation of a temporary table in ap_get_mime_headers_core()
      [Joe Schaefer <joe+gmane@sunstarsys.com>]
@@ -319,7 +323,7 @@ Changes with Apache 2.0.48
      is used (e.g., FreeBSD).  [Jeff Trawick]
 
   *) Don't respect the Server header field as set by modules and CGIs.
-     As with 1.3, for proxy requests any such field is from the origin 
+     As with 1.3, for proxy requests any such field is from the origin
      server; otherwise it will have our server info as controlled by
      the ServerTokens directive.  [Jeff Trawick]