From: Stefan Eissing <icing@apache.org>
Date: Thu, 8 Nov 2018 10:55:08 +0000 (+0000)
Subject:  mod_http2: version bump, slave connections cleanup strategy changed
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=833c4951eebe9478c877e75418aa3119f1d1cdbc;p=thirdparty%2Fapache%2Fhttpd.git

 mod_http2: version bump, slave connections cleanup strategy changed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846125 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http2/h2_conn.c b/modules/http2/h2_conn.c
index 0d6c086e5ef..fd3a2813adb 100644
--- a/modules/http2/h2_conn.c
+++ b/modules/http2/h2_conn.c
@@ -363,6 +363,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 bdfdba5015a..e15fa757e64 100644
--- 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-DEV"
+#define MOD_HTTP2_VERSION "1.11.4-DEV"
 
 /**
  * @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 */