]> granicus.if.org Git - apache/commitdiff
v4 for ALPN proposal adding r1670738.
authorYann Ylavic <ylavic@apache.org>
Tue, 26 May 2015 14:09:57 +0000 (14:09 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 26 May 2015 14:09:57 +0000 (14:09 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1681764 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 0d7df642438ba8feb471a3b20322e443c724129c..563ac59469bf92bdcaa060b2ef6588d7ea8fea38 100644 (file)
--- 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).