From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 26 May 2015 13:02:05 +0000 (+0000)
Subject: v3 for ALPN proposal without one remaining HAVE_TLS_NPN stuff.
X-Git-Tag: 2.4.13~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14ae35c85a4f81497c87776787c58077b5d6a67;p=thirdparty%2Fapache%2Fhttpd.git

v3 for ALPN proposal without one remaining HAVE_TLS_NPN stuff.

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

diff --git a/STATUS b/STATUS
index 4362c010841..63e5b8409ed 100644
--- a/STATUS
+++ b/STATUS
@@ -245,7 +245,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   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
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-alpn-v3.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).