You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2011/05/20 18:54:18 UTC

svn commit: r1125463 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS include/ap_release.h

Author: wrowe
Date: Fri May 20 16:54:17 2011
New Revision: 1125463

URL: http://svn.apache.org/viewvc?rev=1125463&view=rev
Log:
Prepare to tag 2.2.19

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/include/ap_release.h

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1125463&r1=1125462&r2=1125463&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri May 20 16:54:17 2011
@@ -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
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1125463&r1=1125462&r2=1125463&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri May 20 16:54:17 2011
@@ -23,8 +23,9 @@ Patches considered for backport are note
 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,

Modified: httpd/httpd/branches/2.2.x/include/ap_release.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/include/ap_release.h?rev=1125463&r1=1125462&r2=1125463&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_release.h Fri May 20 16:54:17 2011
@@ -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"