You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2015/04/19 20:57:45 UTC
svn commit: r1674667 - /httpd/httpd/branches/2.4.x/CHANGES
Author: rjung
Date: Sun Apr 19 18:57:44 2015
New Revision: 1674667
URL: http://svn.apache.org/r1674667
Log:
Correct merge error in r1673860 and r1673871:
move CHANGES entries to correct version.
Use "mod_ssl" instead of "ssl".
Modified:
httpd/httpd/branches/2.4.x/CHANGES
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1674667&r1=1674666&r2=1674667&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Apr 19 18:57:44 2015
@@ -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).