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 50c704d3dfbbc31e91245548666d1f3c2063e04f..46898c43160211cbe4b99bde2cbb00af494a71fe 100644 (file)
--- 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 6b8832b4724751c87b8953b8ef37bf663e6c16c2..aa0f8c65019a278f2b76e57585524c0cdbd9f3f2 100644 (file)
--- 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>