From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 4 Apr 2014 14:08:00 +0000 (+0000)
Subject: Add compatibility changes to SSLOCSPUseRequestNonce (manual) proposal.
X-Git-Tag: 2.4.10~382
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=162fc4ec6f094a5c9990e8cc2d8cc7377056f7af;p=apache

Add compatibility changes to SSLOCSPUseRequestNonce (manual) proposal.
Remove other manual changes proposal (CTR, already backported).


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

diff --git a/STATUS b/STATUS
index 69359f3773..7e62488ee1 100644
--- a/STATUS
+++ b/STATUS
@@ -219,6 +219,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      one. PR 56233.
      trunk patch: http://svn.apache.org/r1583191
                   http://svn.apache.org/r1584098
+                  http://svn.apache.org/r1584665 (manual: use 2.4's backport
+                                                  version instead of temporary
+                                                  2.5-dev <compatibility> ref)
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
@@ -236,13 +239,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic
 
-   * manuals: Remove modules' compatibility references to httpd < 2.4 and
-              OpenSSL < 0.9.8.
-     trunk patch: http://svn.apache.org/r1584555
-                  http://svn.apache.org/r1584572
-     2.4.x patch: https://people.apache.org/~ylavic/httpd-2.4.x-manuals-obsolete-compatibility.patch
-     +1: ylavic
-
 OTHER PROPOSALS
 
    * A list of further possible backports can be found at: