]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
And we are 2.4.22-dev
authorJim Jagielski <jim@apache.org>
Thu, 16 Jun 2016 16:56:47 +0000 (16:56 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 16 Jun 2016 16:56:47 +0000 (16:56 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1748762 13f79535-47bb-0310-9956-ffa450edef68

CHANGES
STATUS
docs/manual/style/version.ent
include/ap_release.h

diff --git a/CHANGES b/CHANGES
index 5678bd8be681b994c575a008fa8c4d33d5f43e2b..17ee005c4a009e3f137ebc861b03c045cec08c86 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.22
+
 Changes with Apache 2.4.21
 
   *) mod_http2: more rigid error handling in DATA frame assembly, leading
diff --git a/STATUS b/STATUS
index b7e48bc0d1826152fec88232a464d62b586280e7..f4a0b032bba16bc354f45bc0d982c84159688403 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -34,6 +34,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.4.22  : In development.
     2.4.21  : Tagged on June 16, 2016.
     2.4.20  : Tagged on April 4, 2016. Released on April 11, 2016.
     2.4.19  : Tagged on March 21, 2016, not released.
index 90f5fc49a64128bb804d7e6f6edcbad23ae52076..cac228d3cbdc5e615b2f7f1b040d98f21390d441 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "21">
+<!ENTITY httpd.patch "22">
 
 <!ENTITY httpd.docs "2.4">
index 4f677c0ab7517563ff7f650780817686870fdeb0..afd66d16b0095d3867e6ef8361a7f9baa56a436e 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   21
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   22
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */