]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
And we are 2.4.25-dev
authorJim Jagielski <jim@apache.org>
Fri, 16 Dec 2016 11:57:50 +0000 (11:57 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 16 Dec 2016 11:57:50 +0000 (11:57 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1774577 13f79535-47bb-0310-9956-ffa450edef68

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

diff --git a/CHANGES b/CHANGES
index 11152777d0b8b8b73f5122c9cfc582c7885fcf6f..a82bed409a7c7b6b0cbdaa48d86bad6c793a9c22 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.4.25
+
 Changes with Apache 2.4.24
 
   *) SECURITY: CVE-2016-8740 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index c196558c262231aa44c4206b73d263e0169b14a2..42c8d18261fdc3df6e3405c9406b1b9a256a2f05 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.25  : In development.
     2.4.24  : Tagged on December 16, 2016.
     2.4.23  : Tagged on June 30, 2016. Released on July 05, 2016.
     2.4.22  : Tagged on June 20, 2016, not released.
index 697d69861c6e01bd266df5f783266f9d494ecf56..0c2a5f38684dcf4befd0aeec32bd6c079237c7a5 100644 (file)
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "24">
+<!ENTITY httpd.patch "25">
 
 <!ENTITY httpd.docs "2.4">
index 388f7c477588f0f79da765bf9e3f87e31e072fd5..35ace5a421a7de1a5ad5d58d43d21ba58af1f755 100644 (file)
@@ -43,8 +43,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER   24
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   25
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */