backport proposal

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

diff --git a/STATUS b/STATUS
index 3b4982d1f4b54e89e7fa0f2b4113776c94cf9cb6..f94eba06d913ddb5d360e524472d5eeca9de6e70 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -208,6 +208,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1845768 ^/httpd/httpd/trunk .
      +1: icing, jim
 
+  *) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2
+     connections.
+     trunk patch: http://svn.apache.org/r1846112
+     2.4.x patch: svn merge -c 1846112 ^/httpd/httpd/trunk .
+     +1: icing, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]

diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
index 2e956593aa26d85073e402b5f09fdd296baad00c..bb62008190bda8f9285a2b835da4f411ffc1a3c1 100644 (file)
--- a/modules/http2/h2_conn.c
+++ b/modules/http2/h2_conn.c
@@ -354,6 +354,7 @@ apr_status_t h2_slave_run_pre_connection(conn_rec *slave, apr_socket_t *csd)
          * (Not necessarily in pre_connection, but later. Set it here, so it
          * is in place.) */
         slave->keepalives = 1;
+        slave->keepalive = AP_CONN_CLOSE;
         return ap_run_pre_connection(slave, csd);
     }
     return APR_SUCCESS;