From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 20 May 2011 16:54:17 +0000 (+0000)
Subject: Prepare to tag 2.2.19
X-Git-Tag: 2.2.19~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1345125f0770cefc8b7230d8195502288d0ed766;p=thirdparty%2Fapache%2Fhttpd.git

Prepare to tag 2.2.19

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

diff --git a/CHANGES b/CHANGES
index 4157fa69b2a..3992198a9fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.19
 
-
+  *) Revert ABI breakage in 2.2.18 caused by the function signature change
+     of ap_unescape_url_keep2f().  This release restores the signature from
+     2.2.17 and prior, and introduces ap_unescape_url_keep2f_ex().
+     [Eric Covener] 
 
 Changes with Apache 2.2.18
 
diff --git a/STATUS b/STATUS
index 4b130a6e60e..88116c50eae 100644
--- a/STATUS
+++ b/STATUS
@@ -23,8 +23,9 @@ 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.19  : In maintenance
-    2.2.18  : Tagged May 8, 2011.
+    2.2.20  : In maintenance
+    2.2.19  : Tagged May 20, 2011. ABI restored.
+    2.2.18  : Released May 11, 2011. ABI broken.
     2.2.17  : Released October 19, 2010.
     2.2.16  : Released July 25, 2010.
     2.2.15  : Released March 6, 2010.
@@ -75,7 +76,8 @@ CURRENT RELEASE NOTES:
 
   * Forward binary compatibility is expected of Apache 2.2.x releases, such
     that no MMN major number changes will occur.  Such changes can only be
-    made in the trunk.
+    made in the trunk.  Note 2.2.18 contained an incompatible ABI change,
+    subsequently corrected, and should not be referenced.
 
   * All commits to branches/2.2.x must be reflected in SVN trunk,
     as well, if they apply.  Logical progression is commit to trunk,
diff --git a/include/ap_release.h b/include/ap_release.h
index 859d2d903e6..b4735260afc 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -46,7 +46,7 @@
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
 #define AP_SERVER_PATCHLEVEL_NUMBER   19
-#define AP_SERVER_DEVBUILD_BOOLEAN    1
+#define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"