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/09/09 16:12:21 UTC

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

Author: wrowe
Date: Fri Sep  9 14:12:21 2011
New Revision: 1167191

URL: http://svn.apache.org/viewvc?rev=1167191&view=rev
Log:
Onto .22

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=1167191&r1=1167190&r2=1167191&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Sep  9 14:12:21 2011
@@ -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)

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1167191&r1=1167190&r2=1167191&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Sep  9 14:12:21 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.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.

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=1167191&r1=1167190&r2=1167191&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_release.h Fri Sep  9 14:12:21 2011
@@ -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"