Merge of r1752087 from trunk:

mod_http2: fixes flush handling for SETTINGS when no streams are open

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

diff --git a/CHANGES b/CHANGES
index ff65e9e8f3fa1dad9b6743e85e2240d11710e550..63a19ff0dacd3a8e19d63ff0130644d23f95b16f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,9 @@
 
 Changes with Apache 2.4.24
 
-
+  *) mod_http2: fixes connection flush when answering SETTINGS without any
+     stream open. [Moto Ishizawa <@summerwind>, Stefan Eissing]
+     
 Changes with Apache 2.4.23
 
   *) mod_ssl: reset client-verify state of ssl when aborting renegotiations.

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 598df1770fbb50be14f40e9bedf35cd2e728046c..6922b5f43804376c328d2fbdda6f7cafbe47606c 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -2088,6 +2088,7 @@ apr_status_t h2_session_process(h2_session *session, int async)
                 
             case H2_SESSION_ST_IDLE:
                 /* make certain, we send everything before we idle */
+                h2_conn_io_flush(&session->io);
                 if (!session->keep_sync_until && async && !session->open_streams
                     && !session->r && session->remote.emitted_count) {
                     if (trace) {

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index abf69c1d824b1cf1563dea9c48862e1f1109f61a..880da9d7b903a7d7e7656c8142c61e6e2d069dc7 100644 (file)
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -26,7 +26,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "1.5.11"
+#define MOD_HTTP2_VERSION "1.5.12"
 
 /**
  * @macro
@@ -34,7 +34,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 0x01050b
+#define MOD_HTTP2_VERSION_NUM 0x01050c
 
 
 #endif /* mod_h2_h2_version_h */