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 2015/11/19 18:45:27 UTC
svn commit: r1715223 - in /httpd/httpd/trunk/modules/http2: h2_session.c
h2_stream_set.c
Author: icing
Date: Thu Nov 19 17:45:27 2015
New Revision: 1715223
URL: http://svn.apache.org/viewvc?rev=1715223&view=rev
Log:
include fixes for older apr, added flushing for 2.4.x compatibility
Modified:
httpd/httpd/trunk/modules/http2/h2_session.c
httpd/httpd/trunk/modules/http2/h2_stream_set.c
Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1715223&r1=1715222&r2=1715223&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Thu Nov 19 17:45:27 2015
@@ -1482,6 +1482,10 @@ apr_status_t h2_session_process(h2_sessi
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_sessi
}
}
+ if (have_written) {
+ h2_conn_io_flush(&session->io);
+ }
}
end_process:
Modified: httpd/httpd/trunk/modules/http2/h2_stream_set.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_stream_set.c?rev=1715223&r1=1715222&r2=1715223&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_stream_set.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_stream_set.c Thu Nov 19 17:45:27 2015
@@ -16,6 +16,7 @@
#include <assert.h>
#include <stddef.h>
+#include <apr_hash.h>
#include <apr_strings.h>
#include <httpd.h>