From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Sep 2015 13:06:31 +0000 (+0000)
Subject: mod_h2
X-Git-Tag: 2.4.17~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1420ab85699636a50130e8f24f4224d3b5b2db4;p=apache

mod_h2
Via: svn merge -r10:HEAD https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2


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

b1420ab85699636a50130e8f24f4224d3b5b2db4
diff --cc STATUS
index 7ced6de324,7ced6de324..5b5358ee99
--- a/STATUS
+++ b/STATUS
@@@ -110,11 -110,11 +110,6 @@@ RELEASE SHOWSTOPPERS
  PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
    [ start all new proposals below, under PATCHES PROPOSED. ]
  
--  *) mod_h2: add HTTP/2 support to httpd, depends on core/mod_ssl changes above
--     2.4.x branch for this and core/mod_ssl: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2
--     See diff and merged changelists via: 
--         svn diff ^/httpd/httpd/branches/2.4.x ^/httpd/httpd/branches/2.4.17-protocols-http2
--     +1: icing, jim, ylavic
  
  
  PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --cc include/httpd.h
index 91ddd71c72,4204cd0484..beb1a455f7
--- a/include/httpd.h
+++ b/include/httpd.h
@@@ -1550,6 -1550,6 +1550,7 @@@ AP_DECLARE(int) ap_find_etag_weak(apr_p
  AP_DECLARE(int) ap_find_etag_strong(apr_pool_t *p, const char *line, const char *tok);
  
  /**
++<<<<<<< .working
   * Retrieve an array of tokens in the format "1#token" defined in RFC2616. Only
   * accepts ',' as a delimiter, does not accept quoted strings, and errors on
   * any separator.
diff --cc modules/ssl/ssl_engine_kernel.c
index 0ac64bfeff,ac0c670174..4992ac0a0a
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@@ -2171,8 -2135,8 +2135,9 @@@ int ssl_callback_SessionTicket(SSL *ssl
  }
  #endif /* HAVE_TLS_SESSION_TICKETS */
  
 -
++<<<<<<< .working
  #ifdef HAVE_TLS_ALPN
 +
  /*
   * This callback function is executed when the TLS Application-Layer
   * Protocol Negotiation Extension (ALPN, RFC 7301) is triggered by the Client