From: Stefan Eissing <icing@apache.org>
Date: Thu, 19 Nov 2015 17:45:27 +0000 (+0000)
Subject: include fixes for older apr, added flushing for 2.4.x compatibility
X-Git-Tag: 2.5.0-alpha~2635
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42bea24a62f7782572b716fa73377dc418fef865;p=thirdparty%2Fapache%2Fhttpd.git

include fixes for older apr, added flushing for 2.4.x compatibility

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

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 50c704d3dfb..46898c43160 100644
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -1482,6 +1482,10 @@ apr_status_t h2_session_process(h2_session *session)
                 if (APR_STATUS_IS_EAGAIN(status)) {
                     status = APR_SUCCESS;
                 }
+                else if (status == APR_SUCCESS) {
+                    /* need to flush window updates onto the connection asap */
+                    h2_conn_io_flush(&session->io);
+                }
             }
             
             h2_session_resume_streams_with_data(session);
@@ -1494,6 +1498,9 @@ apr_status_t h2_session_process(h2_session *session)
             }
         }
         
+        if (have_written) {
+            h2_conn_io_flush(&session->io);
+        }
     }
     
 end_process:
diff --git a/modules/http2/h2_stream_set.c b/modules/http2/h2_stream_set.c
index 6b8832b4724..aa0f8c65019 100644
--- a/modules/http2/h2_stream_set.c
+++ b/modules/http2/h2_stream_set.c
@@ -16,6 +16,7 @@
 #include <assert.h>
 #include <stddef.h>
 
+#include <apr_hash.h>
 #include <apr_strings.h>
 
 #include <httpd.h>