You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2022/11/29 13:19:08 UTC

svn commit: r1905606 - in /httpd/httpd/branches/2.4.x: ./ CHANGES Makefile.in include/ap_mmn.h

Author: covener
Date: Tue Nov 29 13:19:07 2022
New Revision: 1905606

URL: http://svn.apache.org/viewvc?rev=1905606&view=rev
Log:
Merge r1727934 from trunk:

exporting mod_http2.h

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

Github: closes #327

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/Makefile.in
    httpd/httpd/branches/2.4.x/include/ap_mmn.h

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1727934

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1905606&r1=1905605&r2=1905606&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Nov 29 13:19:07 2022
@@ -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

Modified: httpd/httpd/branches/2.4.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.in?rev=1905606&r1=1905605&r2=1905606&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/Makefile.in Tue Nov 29 13:19:07 2022
@@ -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 \

Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1905606&r1=1905605&r2=1905606&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Tue Nov 29 13:19:07 2022
@@ -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