You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/07/10 13:02:17 UTC

svn commit: r1752087 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_session.c

Author: icing
Date: Sun Jul 10 13:02:17 2016
New Revision: 1752087

URL: http://svn.apache.org/viewvc?rev=1752087&view=rev
Log:
mod_http2: fixing flush on SETTINGS frames without open streams

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/http2/h2_session.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1752087&r1=1752086&r2=1752087&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Jul 10 13:02:17 2016
@@ -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]

Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1752087&r1=1752086&r2=1752087&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Sun Jul 10 13:02:17 2016
@@ -2088,6 +2088,7 @@ apr_status_t h2_session_process(h2_sessi
                 
             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) {