From 27aa64f80ae546b873f20872519eb9528a9f2df8 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 13 Mar 2014 16:41:41 +0000 Subject: [PATCH] And we are at 2.4.10-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1577237 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 11 +++++++---- STATUS | 1 + docs/manual/style/version.ent | 2 +- include/ap_release.h | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 17739c1008..edcaca33f6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,15 +1,18 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.10 + + Changes with Apache 2.4.9 *) mod_ssl: Work around a bug in some older versions of OpenSSL that would cause a crash in SSL_get_certificate for servers where the certificate hadn't been sent. [Stephen Henson] - *) mod_lua: Add a fixups hook that checks if the original request is intended - for LuaMapHandler. This fixes a bug where FallbackResource invalidates the - LuaMapHandler directive in certain cases by changing the URI before the map - handler code executes [Daniel Gruno, Daniel Ferradal ]. + *) mod_lua: Add a fixups hook that checks if the original request is intended + for LuaMapHandler. This fixes a bug where FallbackResource invalidates the + LuaMapHandler directive in certain cases by changing the URI before the map + handler code executes [Daniel Gruno, Daniel Ferradal ]. Changes with Apache 2.4.8 diff --git a/STATUS b/STATUS index acb0a2aba0..c8e0841c27 100644 --- a/STATUS +++ b/STATUS @@ -32,6 +32,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.10 : In development. 2.4.9 : Tagged on March 13, 2014. 2.4.8 : Tagged on March 11, 2014. Not released. 2.4.7 : Tagged on November 19, 2013. Released on Nov 25, 2013 diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 5ec66dcc62..e8e9bd0cc7 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 f03eae06ab..a61e255829 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 9 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 10 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */ -- 2.50.1