Merge of r1846125 from trunk:

mod_http2: change in cleanup strategy for slave connections.

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

diff --git a/STATUS b/STATUS
index c3e074344d50a48794338b353ff648a1a610dd38..d375fd05dd06dc3cc6d399430ebaf705aad16374 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -126,11 +126,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_http2: change in cleanup strategy for slave connections.
-     trunk patch: http://svn.apache.org/r1846125
-     2.4.x patch: svn merge -c 1846125 ^/httpd/httpd/trunk .
-     +1: icing, jim, wrowe
-
   *) mod_session: Always decode session attributes early.
      trunk patch: http://svn.apache.org/r1850947
      2.4.x patch: svn merge -c 1850947 ^/httpd/httpd/trunk .

diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
index 2e956593aa26d85073e402b5f09fdd296baad00c..88da2bab3e92c643886ea2ad769894f034b5ba21 100644 (file)
--- a/modules/http2/h2_conn.c
+++ b/modules/http2/h2_conn.c
@@ -354,6 +354,15 @@ 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;
+        /* We signal that this connection will be closed after the request.
+         * Which is true in that sense that we throw away all traffic data
+         * on this slave connection after each requests. Although we might
+         * reuse internal structures like memory pools.
+         * The wanted effect of this is that httpd does not try to clean up
+         * any dangling data on this connection when a request is done. Which
+         * is unneccessary on a h2 stream.
+         */
+        slave->keepalive = AP_CONN_CLOSE;
         return ap_run_pre_connection(slave, csd);
     }
     return APR_SUCCESS;

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 13b7add273d1e9e11fda2c148e89bbb0df77e6d0..707943726743f42d8797f82a9f640b4f727b6497 100644 (file)
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.11.3"
+#define MOD_HTTP2_VERSION "1.11.4"
 
 /**
  * @macro
@@ -35,7 +35,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_HTTP2_VERSION_NUM 0x010b03
+#define MOD_HTTP2_VERSION_NUM 0x010b04
 
 
 #endif /* mod_h2_h2_version_h */