From: Jim Jagielski Date: Thu, 30 Jun 2016 17:15:54 +0000 (+0000) Subject: And we are 2.4.24-dev X-Git-Tag: 2.4.24~395 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a02a422e3900fa3f8f7473c94dc1dc8c7f26ec88;p=apache And we are 2.4.24-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750841 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index cc2f340582..ff65e9e8f3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.24 + + Changes with Apache 2.4.23 *) mod_ssl: reset client-verify state of ssl when aborting renegotiations. diff --git a/STATUS b/STATUS index f2e23d104c..8a256999b9 100644 --- a/STATUS +++ b/STATUS @@ -34,6 +34,7 @@ Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] + 2.4.24 : In development. 2.4.23 : Tagged on June 30, 2016. 2.4.22 : Tagged on June 20, 2016, not released. 2.4.21 : Tagged on June 16, 2016, not released. diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index af2170c813..697d69861c 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 2c5e13c0e3..87160f13fe 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 4 -#define AP_SERVER_PATCHLEVEL_NUMBER 23 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 24 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */