From: Jim Jagielski <jim@apache.org>
Date: Tue, 1 Mar 2011 17:06:22 +0000 (+0000)
Subject: And roll onto 2.3.12
X-Git-Tag: 2.3.12~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7e30d8231fb6fe488ae64fb4cc3c5b7ed3ca728;p=thirdparty%2Fapache%2Fhttpd.git

And roll onto 2.3.12


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1075924 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 0d5c6a997c4..b09f698e974 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.12
+
+
 Changes with Apache 2.3.11
 
   *) mod_proxy: balancer-manager now uses POST instead of GET.
diff --git a/STATUS b/STATUS
index d3a300afa7a..83ce487a3cc 100644
--- a/STATUS
+++ b/STATUS
@@ -26,6 +26,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.3.12  : In development.
     2.3.11  : Tagged on March 1, 2011 (beta).
     2.3.10  : Tagged on December 13, 2010. Released Dec 21, 2010.
     2.3.9   : Tagged on November 23, 2010, not released.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index b2558e644bc..83d44575b56 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "3">
-<!ENTITY httpd.patch "11">
+<!ENTITY httpd.patch "12">
 
 <!ENTITY httpd.docs "trunk">
diff --git a/include/ap_release.h b/include/ap_release.h
index 53598666d5c..8bdb6531de5 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 3
-#define AP_SERVER_PATCHLEVEL_NUMBER   11
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   12
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"