From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 26 May 2015 12:23:31 +0000 (+0000)
Subject: Propose ALPN support.
X-Git-Tag: 2.4.13~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b7f41eac1bc5fad8c0c02f17da54fcfff08b0b4;p=thirdparty%2Fapache%2Fhttpd.git

Propose ALPN support.

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

diff --git a/STATUS b/STATUS
index 79891037ce9..4362c010841 100644
--- a/STATUS
+++ b/STATUS
@@ -232,6 +232,24 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~rjung/patches/httpd-2.4.x-free-eckey.patch
      +1: rjung, ylavic
 
+  *) mod_ssl: add ALPN support by allowing other modules to register callbacks
+              for negotiation of the application layer protocol.  PR 52210.
+     trunk patch: http://svn.apache.org/r1332643
+                  http://svn.apache.org/r1487772
+                  http://svn.apache.org/r1670397
+                  http://svn.apache.org/r1670434
+                  http://svn.apache.org/r1670436
+                  http://svn.apache.org/r1670578
+                  http://svn.apache.org/r1675459
+                  http://svn.apache.org/r1676004
+                  http://svn.apache.org/r1676709
+                  http://svn.apache.org/r1681741
+                  http://svn.apache.org/r1681746
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-alpn-v2.patch
+     +1:
+     ylavic: we'd better comment on @dev for this one for Stefan Eissing (who
+             proposed the merge) to be able to follow (and comment too).
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED