Onto .22

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

diff --git a/CHANGES b/CHANGES
index 13ca80ce0519bf4b2a940931c3c59fbe3f71a9d5..6bb8a235c707949fad0c0a0c742f0a051ac89439 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.22
+
+
+
 Changes with Apache 2.2.21
 
   *) SECURITY: CVE-2011-3348 (cve.mitre.org)

diff --git a/STATUS b/STATUS
index 669271af252a66e19a147fe54ea224ab42d1a552..1358ca1e4c293c9d8f618103e4f3316b9b558d17 100644 (file)
--- 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.22  : In development.
     2.2.21  : Tagged September 9, 2011.
     2.2.20  : Released August 30, 2011.
     2.2.19  : Tagged May 20, 2011. ABI restored.

diff --git a/include/ap_release.h b/include/ap_release.h
index ba7f9e29d0aab08d7ecb38062070856fa5033b26..d3da8a6f4e9a16b05cd888b2c8d06a08994519f4 100644 (file)
--- 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   21
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   22
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"