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 2013/06/28 22:33:30 UTC
svn commit: r1497916 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
docs/manual/style/version.ent include/ap_release.h
Author: wrowe
Date: Fri Jun 28 20:33:30 2013
New Revision: 1497916
URL: http://svn.apache.org/r1497916
Log:
And on to .26
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=1497916&r1=1497915&r2=1497916&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Jun 28 20:33:30 2013
@@ -1,4 +1,8 @@
-*- coding: utf-8 -*-
+Changes with Apache 2.2.26
+
+
+
Changes with Apache 2.2.25
*) SECURITY: CVE-2013-1862 (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=1497916&r1=1497915&r2=1497916&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jun 28 20:33:30 2013
@@ -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.26 : In maintenance
2.2.25 : Tagged June 28, 2013
2.2.24 : Released February 25, 2012
2.2.23 : Released September 13, 2012
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=1497916&r1=1497915&r2=1497916&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 Fri Jun 28 20:33:30 2013
@@ -19,6 +19,6 @@
<!ENTITY httpd.major "2">
<!ENTITY httpd.minor "2">
-<!ENTITY httpd.patch "25">
+<!ENTITY httpd.patch "26">
<!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=1497916&r1=1497915&r2=1497916&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.2.x/include/ap_release.h Fri Jun 28 20:33:30 2013
@@ -45,8 +45,8 @@
#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER 25
-#define AP_SERVER_DEVBUILD_BOOLEAN 0
+#define AP_SERVER_PATCHLEVEL_NUMBER 26
+#define AP_SERVER_DEVBUILD_BOOLEAN 1
/* Synchronize the above with docs/manual/style/version.ent */