diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2011-05-20 16:54:17 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2011-05-20 16:54:17 +0000 |
| commit | 1345125f0770cefc8b7230d8195502288d0ed766 (patch) | |
| tree | 797e61d0456db908a8f4a9f17b777f00811862b3 | |
| parent | 6f31f3a0c0fd9bce2b1a71fba7a080dccda7d69a (diff) | |
| download | httpd-1345125f0770cefc8b7230d8195502288d0ed766.tar.gz | |
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
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | STATUS | 8 | ||||
| -rw-r--r-- | include/ap_release.h | 2 |
3 files changed, 10 insertions, 5 deletions
@@ -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 @@ -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 859d2d903e..b4735260af 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" |