From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 26 May 2015 14:09:57 +0000 (+0000)
Subject: v4 for ALPN proposal adding r1670738.
X-Git-Tag: 2.4.13~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07766e32c7c45f21829092d8c9e8093f7c64f677;p=thirdparty%2Fapache%2Fhttpd.git

v4 for ALPN proposal adding r1670738.

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

diff --git a/STATUS b/STATUS
index 0d7df642438..563ac59469b 100644
--- a/STATUS
+++ b/STATUS
@@ -240,12 +240,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1670434
                   http://svn.apache.org/r1670436
                   http://svn.apache.org/r1670578
+                  http://svn.apache.org/r1670738
                   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-v3.patch
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-alpn-v4.patch
      +1: ylavic
      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).