From: Eric Covener <covener@apache.org>
Date: Tue, 29 Nov 2022 13:19:07 +0000 (+0000)
Subject: Merge r1727934 from trunk:
X-Git-Tag: 2.4.55-rc1-candidate~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2929d7dab9a084b2c6f513e3144a63f966ca1e0d;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1727934 from trunk:

exporting mod_http2.h

Submitted by: icing
Reviewed by:  icing, rpluem, ylavic

Github: closes #327


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1905606 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 27317a3ade6..f9fad4b1d89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.55
 
+  *) mod_http2: Export mod_http2.h as public header. [Stefan Eissing]
+
   *) mod_md: a new directive `MDStoreLocks` can be used on cluster
      setups with a shared file system for `MDStoreDir` to order
      activation of renewed certificates when several cluster nodes are
diff --git a/Makefile.in b/Makefile.in
index dd46a59e1a3..ebf7a1660f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -255,6 +255,7 @@ INSTALL_HEADERS = \
 	$(srcdir)/modules/cache/cache_common.h \
 	$(srcdir)/modules/database/mod_dbd.h \
 	$(srcdir)/modules/dav/main/mod_dav.h \
+	$(srcdir)/modules/http2/mod_http2.h \
 	$(srcdir)/modules/filters/mod_include.h \
 	$(srcdir)/modules/filters/mod_xml2enc.h \
 	$(srcdir)/modules/generators/mod_cgi.h \
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 6536609d28b..d11bfd2f987 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -592,6 +592,7 @@
  * 20120211.123 (2.4.51-dev) Added ap_pcre_version_string(), AP_REG_PCRE_COMPILED
  *                           and AP_REG_PCRE_LOADED to ap_regex.h.
  * 20120211.124 (2.4.51-dev) Add name_ex to struct proxy_worker_shared
+ * 20120211.125 (2.4.55-dev) Export mod_http2.h as public header
  *
  */
 
@@ -600,7 +601,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20120211
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 124                 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 125                 /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a