From 2bd28f8987801a5cf7939ce8a2128c37deb11c4a Mon Sep 17 00:00:00 2001
From: Stefan Eissing <stefan.eissing@greenbytes.de>
Date: Thu, 30 Sep 2021 09:42:23 +0200
Subject: [PATCH]  * fixing an uninitialized status code when pollsets are not
 used for streams.

---
 ChangeLog                 | 4 ++++
 mod_http2/h2_mplx.c       | 2 +-
 mod_http2/h2_version.h    | 2 +-
 mod_http2/h2_version.h.in | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 698006a5..fe7e7f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+v2.0.0-rc4
+--------------------------------------------------------------------------------
+ * fixing an uninitialized status code when pollsets are not used for streams.
+
 v2.0.0-rc3
 --------------------------------------------------------------------------------
  * Added an alternate implementation when polling of file descriptors is
diff --git a/mod_http2/h2_mplx.c b/mod_http2/h2_mplx.c
index d413eacc..39880bc7 100644
--- a/mod_http2/h2_mplx.c
+++ b/mod_http2/h2_mplx.c
@@ -1064,7 +1064,7 @@ static apr_status_t mplx_pollset_create(h2_mplx *m)
 
 static apr_status_t mplx_pollset_add(h2_mplx *m, h2_conn_ctx_t *conn_ctx)
 {
-    apr_status_t rv;
+    apr_status_t rv = APR_SUCCESS;
     const char *name = "";
 
     if (conn_ctx->pfd_out_prod.reqevents) {
diff --git a/mod_http2/h2_version.h b/mod_http2/h2_version.h
index 8fadabfe..5810e8d8 100644
--- a/mod_http2/h2_version.h
+++ b/mod_http2/h2_version.h
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "2.0.0-rc3-git"
+#define MOD_HTTP2_VERSION "2.0.0-rc4-git"
 
 /**
  * @macro
diff --git a/mod_http2/h2_version.h.in b/mod_http2/h2_version.h.in
index 68b27c75..5e7b057a 100644
--- a/mod_http2/h2_version.h.in
+++ b/mod_http2/h2_version.h.in
@@ -27,7 +27,7 @@
  * @macro
  * Version number of the http2 module as c string
  */
-#define MOD_HTTP2_VERSION "@PACKAGE_VERSION@-rc3-git"
+#define MOD_HTTP2_VERSION "@PACKAGE_VERSION@-rc4-git"
 
 /**
  * @macro