*) mod_http2: update to version 2.0.38

     Source sync with mod_h2 github repository. No functional change.

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

diff --git a/changes-entries/h2_v2.0.38.txt b/changes-entries/h2_v2.0.38.txt
new file mode 100644 (file)
index 0000000..0945bd7
--- /dev/null
+++ b/changes-entries/h2_v2.0.38.txt
@@ -0,0 +1,3 @@
+  *) mod_http2: update to version 2.0.38
+     Source sync with mod_h2 github repository. No functional change.
+     [Stefan Eissing]

diff --git a/modules/http2/h2_c1.c b/modules/http2/h2_c1.c
index 626e665b3fc8341e2fdcb1304dcb048913e4555e..f4604a47d16e3fdf6f74f03e5141a3e1964f13c1 100644 (file)
--- a/modules/http2/h2_c1.c
+++ b/modules/http2/h2_c1.c
@@ -47,7 +47,10 @@
 
 static struct h2_workers *workers;
 
-static int async_mpm, mpm_can_waitio;
+static int async_mpm;
+#ifdef AP_MPMQ_CAN_WAITIO
+static int mpm_can_waitio;
+#endif
 
 APR_OPTIONAL_FN_TYPE(ap_logio_add_bytes_in) *h2_c_logio_add_bytes_in;
 APR_OPTIONAL_FN_TYPE(ap_logio_add_bytes_out) *h2_c_logio_add_bytes_out;

diff --git a/modules/http2/h2_session.c b/modules/http2/h2_session.c
index 21ede5c100d2e65249862c4ec312242437f9abfe..2f921500db755cd29a35617308a1efd07df01ead 100644 (file)
--- a/modules/http2/h2_session.c
+++ b/modules/http2/h2_session.c
@@ -125,7 +125,7 @@ static h2_stream *h2_session_open_stream(h2_session *session, int stream_id,
     apr_allocator_t *allocator;
     apr_pool_t *stream_pool;
     apr_status_t rv;
-    
+
     rv = apr_allocator_create(&allocator);
     if (rv != APR_SUCCESS)
       return NULL;
@@ -135,7 +135,7 @@ static h2_stream *h2_session_open_stream(h2_session *session, int stream_id,
     apr_allocator_owner_set(allocator, stream_pool);
     apr_pool_abort_set(abort_on_oom, stream_pool);
     apr_pool_tag(stream_pool, "h2_stream");
-    
+
     stream = h2_stream_create(stream_id, stream_pool, session, 
                               session->monitor, initiated_on);
     if (stream) {

diff --git a/modules/http2/h2_version.h b/modules/http2/h2_version.h
index 8bcaf69e0a92f68dbb6541f0d8742ae5b9a9d040..0cccbca89c8456c3f37f101f1b6cbb81694464e5 100644 (file)
--- a/modules/http2/h2_version.h
+++ b/modules/http2/h2_version.h
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "2.0.37"
+#define MOD_HTTP2_VERSION "2.0.38"
 
 /**
  * @macro
@@ -35,7 +35,7 @@
  * release. This is a 24 bit number with 8 bits for major number, 8 bits
  * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
  */
-#define MOD_HTTP2_VERSION_NUM 0x020025
+#define MOD_HTTP2_VERSION_NUM 0x020026
 
 
 #endif /* mod_h2_h2_version_h */