mod_http2: fixing flush on SETTINGS frames without open streams

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

diff --git a/CHANGES b/CHANGES
index 6c0f632803bd5b21fe4bdec3b3973b3509ab2665..efe53237e4ff8ce5aa037a3eb3a85abd18649186 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_http2: fixes connection flush when answering SETTINGS without any
+     stream open. [Moto Ishizawa <@summerwind>, Stefan Eissing]
+     
   *) ab: Add option -I to use the Server Name Indication (SNI) extension on
      outgoing TLS connections, according to the Host header (if any) or the
      requested URL's hostname otherwise.  [Yann Ylavic]

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) {