You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2011/08/30 02:11:54 UTC

svn commit: r1163058 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS docs/manual/style/version.ent include/ap_release.h

Author: jim
Date: Tue Aug 30 00:11:53 2011
New Revision: 1163058

URL: http://svn.apache.org/viewvc?rev=1163058&view=rev
Log:
And we are at 2.2.21-dev

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/manual/style/version.ent
    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=1163058&r1=1163057&r2=1163058&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Aug 30 00:11:53 2011
@@ -1,4 +1,7 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.2.21
+
+
 Changes with Apache 2.2.20
 
   *) SECURITY: CVE-2011-3192 (cve.mitre.org)

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1163058&r1=1163057&r2=1163058&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Aug 30 00:11:53 2011
@@ -23,6 +23,7 @@ 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.21  : In development
     2.2.20  : Tagged August 29, 2011.
     2.2.19  : Tagged May 20, 2011. ABI restored.
     2.2.18  : Released May 11, 2011. ABI broken.

Modified: httpd/httpd/branches/2.2.x/docs/manual/style/version.ent
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/style/version.ent?rev=1163058&r1=1163057&r2=1163058&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/style/version.ent (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/style/version.ent Tue Aug 30 00:11:53 2011
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "20">
+<!ENTITY httpd.patch "21">
 
 <!ENTITY httpd.docs "2.2">

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=1163058&r1=1163057&r2=1163058&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_release.h Tue Aug 30 00:11:53 2011
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   20
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   21
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"