From: Jim Jagielski <jim@apache.org>
Date: Fri, 16 Dec 2016 11:57:50 +0000 (+0000)
Subject: And we are 2.4.25-dev
X-Git-Tag: 2.4.25~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6af53f782333497d011b67482eb4a2832f7d0851;p=thirdparty%2Fapache%2Fhttpd.git

And we are 2.4.25-dev


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

diff --git a/CHANGES b/CHANGES
index 11152777d0b..a82bed409a7 100644
--- 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 c196558c262..42c8d18261f 100644
--- 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.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index 697d69861c6..0c2a5f38684 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -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">
diff --git a/include/ap_release.h b/include/ap_release.h
index 388f7c47758..35ace5a421a 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -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 */