Synch with 2.0 branch.

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

1 files changed, 14 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index bc32a7c30e..325d47d917 100644
--- a/CHANGES
+++ b/CHANGES
@@ -59,10 +59,6 @@ Changes with Apache 2.1.0-dev
   *) mod_ssl: Remove the shmht session cache, shmcb should be used
      instead.  [Joe Orton]
 
-  *) mod_ssl: SSL_VERSION_LIBRARY is set to the version string from the
-     SSL library used at run-time, rather than at compile-time.
-     PR: 23956  [Eric Seidel <eseidel apple.com>]
-
   *) mod_logio: Account for some bytes handed to the network layer prior to
      dropped connections.  [Jeff Trawick]
 
@@ -88,9 +84,6 @@ Changes with Apache 2.1.0-dev
      treated the supplied regex as literal string. PR 24219.
      [André Malo]
 
-  *) mod_ssl: Fix segfault on a non-SSL request if the the 'c' log
-     format code is used. PR 22741. [Gary E. Miller <gem rellim.com>]
-
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
@@ -262,6 +255,14 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_ssl: Advertise SSL library version as determined at run-time rather
+     than at compile-time.  PR 23956.  [Eric Seidel <seidel apple.com>]
+
+  *) mod_ssl: Fix segfault on a non-SSL request if the 'c' log
+     format code is used.  PR 22741.  [Gary E. Miller <gem rellim.com>]
+
+  *) Fix build with parallel make.  PR 24643.  [Joe Orton]
+
   *) mod_rewrite: In external rewrite maps lookup keys containing
      a newline now cause a lookup failure. PR 14453.
      [Cedric Gavage <cedric.gavage unixtech.be>, André Malo]
@@ -1882,7 +1883,7 @@ Changes with Apache 2.0.37
 
   *) Win32: During a graceful restart, threads in the new process
      were accessing scoreboard slots still in use by active threads in 
-     the the old process. [Bill Stoddard]
+     the old process. [Bill Stoddard]
 
 Changes with Apache 2.0.36
 
@@ -4053,7 +4054,7 @@ Changes with Apache 2.0.18
 
 Changes with Apache 2.0.17
 
-  *) If a higher-level filter handles the the byterange aspects of a
+  *) If a higher-level filter handles the byterange aspects of a
      request, then the byterange filter should not try to redo the
      work.  The most common case of this happening, is a byterange
      request going through the proxy, and the origin server handles
@@ -4075,7 +4076,7 @@ Changes with Apache 2.0.17
      [jun-ichiro hagino <itojun iijlab.net>]
 
   *) The ap_f* functions should flush data to the filter that is passed
-     in, not the the filter after the one passed in.
+     in, not the filter after the one passed in.
      [Ryan Morgan <rmorgan covalent.net>]
 
   *) Make ab work again by changing its native types to apr types and formats.
@@ -4208,7 +4209,7 @@ Changes with Apache 2.0.15
   *) Add a hook, create_request.  This hook allows modules to modify
      a request while it is being created.  This hook is called for all
      request_rec's, main request, sub request, and internal redirect.
-     When this hook is called, the the r->main, r->prev, r->next
+     When this hook is called, the r->main, r->prev, r->next
      pointers have been set, so modules can determine what kind of
      request this is.  [Ryan Bloom]
 
@@ -5020,7 +5021,7 @@ Changes with Apache 2.0a8
 
   *) Expand APR for WinNT to fully accept and return utf-8 encoded
      Unicode file names and paths for Win32, and tag the Content-Type 
-     from mod_autoindex to reflect that charset if the the feature
+     from mod_autoindex to reflect that charset if the feature
      macro APR_HAS_UNICODE_FS is true.  [William Rowe]
 
   *) Compute the content length (and add appropriate header field) for
@@ -11322,7 +11323,7 @@ Changes with Apache 1.2.5
 
   *) SECURITY: Numerous changes to mod_imap in a general cleanup
      including fixing a possible buffer overflow.  This cleanup also
-     was done with 1.3 code as a basis, see the the previous note
+     was done with 1.3 code as a basis, see the previous note
      about mod_include.  [Dean Gaudet]
 
   *) SECURITY: If a htaccess file can not be read due to bad