From: William A. Rowe Jr Date: Mon, 9 Jan 2017 16:37:02 +0000 (+0000) Subject: And we are at 2.2.33-dev X-Git-Tag: 2.2.33~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=533c113b69d37a76d6cb33b7ba5c493cfd0fc16d;p=thirdparty%2Fapache%2Fhttpd.git And we are at 2.2.33-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1778014 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index f262eb5f7e8..f2ca90ff0f5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.2.33 + + + Changes with Apache 2.2.32 *) SECURITY: CVE-2016-8743 (cve.mitre.org) diff --git a/STATUS b/STATUS index fd3e6ec1794..caea69802da 100644 --- a/STATUS +++ b/STATUS @@ -23,6 +23,7 @@ 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.33 : In maintenance until Jul 1st, 2017 2.2.32 : Tagged Jan 9th, 2017 2.2.31 : Released July 16, 2015 2.2.30 : Tagged July 10, 2015. Not released. diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 1d538fecc53..d041ddb7975 100644 --- a/docs/manual/style/version.ent +++ b/docs/manual/style/version.ent @@ -19,6 +19,6 @@ - + diff --git a/include/ap_release.h b/include/ap_release.h index 76bed4a013b..43d85e2c547 100644 --- a/include/ap_release.h +++ b/include/ap_release.h @@ -43,8 +43,8 @@ #define AP_SERVER_MAJORVERSION_NUMBER 2 #define AP_SERVER_MINORVERSION_NUMBER 2 -#define AP_SERVER_PATCHLEVEL_NUMBER 32 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 33 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */