summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2022-11-29 13:19:07 +0000
committerEric Covener <covener@apache.org>2022-11-29 13:19:07 +0000
commit2929d7dab9a084b2c6f513e3144a63f966ca1e0d (patch)
tree19f91f69ce79c30935cc8c470d9826c6fcf6cb89
parentd2bd158b4f0b4a07eea1bd905cd8140d353c36ef (diff)
downloadhttpd-2929d7dab9a084b2c6f513e3144a63f966ca1e0d.tar.gz
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
-rw-r--r--CHANGES2
-rw-r--r--Makefile.in1
-rw-r--r--include/ap_mmn.h3
3 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 27317a3ade..f9fad4b1d8 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 dd46a59e1a..ebf7a1660f 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 6536609d28..d11bfd2f98 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