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

diff --cc STATUS
index 7ced6de324756b4368645d49d29262780cee3fac,7ced6de324756b4368645d49d29262780cee3fac..5b5358ee992af8aeabd5092335b0b3d8e75d3dec
--- 1/STATUS
--- 2/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 91ddd71c721c15fde15bbb121f1c936cbe64efd8,4204cd04840228a432730d44277fa7ba80b2fa09..beb1a455f76347cbf8bab0f37f6533ab3e2eacfa
--- 1/include/httpd.h
--- 2/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 0ac64bfeffb8e53609d6d198648520ad7d2e6f56,ac0c6701747535a519ae26ebdcf54b3b51c0e5cd..4992ac0a0ae9d1960506b6ef07fc7d693caa1d54
--- 1/modules/ssl/ssl_engine_kernel.c
--- 2/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