From: Rainer Jung <rjung@apache.org>
Date: Sun, 19 Apr 2015 18:57:44 +0000 (+0000)
Subject: Correct merge error in r1673860 and r1673871:
X-Git-Tag: 2.4.13~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69d317d59faf76b1eb583179ca53144ac3c41f2a;p=thirdparty%2Fapache%2Fhttpd.git

Correct merge error in r1673860 and r1673871:
move CHANGES entries to correct version.

Use "mod_ssl" instead of "ssl".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1674667 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 17410ffb3e1..04efb1b48b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,7 +19,7 @@ Changes with Apache 2.4.13
   *) mod_http: Fix incorrect If-Match handling. PR 57358
      [Kunihiko Sakamoto <ksakamoto google.com>]
 
-  *) ssl: Add a warning if protocol given in SSLProtocol or SSLProxyProtocol
+  *) mod_ssl: Add a warning if protocol given in SSLProtocol or SSLProxyProtocol
      will override other parameters given in the same directive. This could be
      a missing + or - prefix.  PR 52820 [Christophe Jaillet]
 
@@ -54,6 +54,13 @@ Changes with Apache 2.4.13
   *) core_filters: Restore/disable TCP_NOPUSH option after non-blocking
      sendfile.  [Yann Ylavic]
 
+  *) mod_buffer: Forward flushed input data immediately and avoid (unlikely)
+     access to freed memory. [Yann Ylavic, Christophe Jaillet]
+
+  *) core: Add CGIPassAuth directive to control whether HTTP authorization
+     headers are passed to scripts as CGI variables.  PR 56855.  [Jeff 
+     Trawick]
+
   *) core: Initialize scoreboard's used optional functions on graceful restarts
      to avoid a crash when relocation occurs.  PR 57177.  [Yann Ylavic]
 
@@ -180,13 +187,6 @@ Changes with Apache 2.4.11
      request headers earlier.  Adds "MergeTrailers" directive to restore
      legacy behavior.  [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
 
-  *) mod_buffer: Forward flushed input data immediately and avoid (unlikely)
-     access to freed memory. [Yann Ylavic, Christophe Jaillet]
-
-  *) core: Add CGIPassAuth directive to control whether HTTP authorization
-     headers are passed to scripts as CGI variables.  PR 56855.  [Jeff 
-     Trawick]
-
   *) mod_ssl: New directive SSLSessionTickets (On|Off).
      The directive controls the use of TLS session tickets (RFC 5077),
      default value is "On" (unchanged behavior).