From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 9 Sep 2011 14:12:21 +0000 (+0000)
Subject: Onto .22
X-Git-Tag: 2.2.22~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71bbb0462408adc5c350d2b7a6626aacd923c741;p=thirdparty%2Fapache%2Fhttpd.git

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 13ca80ce051..6bb8a235c70 100644
--- 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 669271af252..1358ca1e4c2 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.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 ba7f9e29d0a..d3da8a6f4e9 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   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"