From: Kaspar Brand <kbrand@apache.org>
Date: Sun, 27 Apr 2014 08:36:35 +0000 (+0000)
Subject: propose mod_ssl backwards compat patch, comment
X-Git-Tag: 2.4.10~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1d9e72dc13863b715f5c61bfb0b45730a664d7;p=apache

propose mod_ssl backwards compat patch, comment

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

diff --git a/STATUS b/STATUS
index 00eb8100c4..b746e784b9 100644
--- a/STATUS
+++ b/STATUS
@@ -180,6 +180,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                                                   2.5-dev <compatibility> ref)
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
+     kbrand: can you fold the trunk patches into a single diff for 2.4.x
+             and put it online under people.apache.org/~ylavic, please?
 
    * mod_expires: don't add Expires header to error responses (4xx/5xx),
                   be they generated or forwarded. PR 55669.
@@ -204,6 +206,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works (w/o docs/log-message-tags/next-number)
      +1: kbrand
 
+   * mod_ssl: restore argument structure for exec-type SSLPassPhraseDialog
+     programs, and implement a special merging algorithm for
+     SSLCertificate[Key]File to emulate the behavior in versions <= 2.4.7
+     trunk patch: not sensible for trunk (unneeded backwards compatibility)
+     2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-pphrase-certkeyfile-compat.diff
+     +1: kbrand
+
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: