From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 28 Jun 2013 20:33:30 +0000 (+0000)
Subject: And on to .26
X-Git-Tag: 2.2.26~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a14e0c5a1b4e93569e686233a6cc550adfa8e07;p=thirdparty%2Fapache%2Fhttpd.git

And on to .26

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

diff --git a/CHANGES b/CHANGES
index 48983bba132..5d0a8f20219 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.26
+
+
+
 Changes with Apache 2.2.25
 
   *) SECURITY: CVE-2013-1862 (cve.mitre.org)
diff --git a/STATUS b/STATUS
index a462efb1f58..98c5f637cc9 100644
--- a/STATUS
+++ b/STATUS
@@ -23,6 +23,7 @@ Patches considered for backport are noted in their branches' STATUS:
 Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
+    2.2.26  : In maintenance
     2.2.25  : Tagged June 28, 2013
     2.2.24  : Released February 25, 2012
     2.2.23  : Released September 13, 2012
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index eec4f460882..ebb579d3b1d 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "25">
+<!ENTITY httpd.patch "26">
 
 <!ENTITY httpd.docs "2.2">
diff --git a/include/ap_release.h b/include/ap_release.h
index 9c573ab5bdf..bdf8acf0e40 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   25
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   26
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */