From 9bc7020b9b2faf342e356da5e00212de3ffae3d0 Mon Sep 17 00:00:00 2001 From: Daniel Ruggeri Date: Tue, 18 Sep 2018 00:53:59 +0000 Subject: [PATCH] Post 2.4.35 tag updates git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1841178 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ STATUS | 3 ++- docs/manual/style/version.ent | 2 +- include/ap_release.h | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 6e22d760866..dd28f7fe8d3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.36 + Changes with Apache 2.4.35 *) http: Enforce consistently no response body with both 204 and 304 diff --git a/STATUS b/STATUS index 310fd3431f3..b62f1ad18fe 100644 --- a/STATUS +++ b/STATUS @@ -29,7 +29,8 @@ Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] - 2.4.35 : In development. + 2.4.36 : In development + 2.4.35 : Tagged on September 17, 2018 2.4.34 : Tagged on July 10, 2018. Released on July 16, 2018. 2.4.33 : Tagged on March 17, 2018. Released on March 21, 2018. 2.4.32 : Tagged on March 09, 2018. Distributed on March 15, 2018, diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 25313dff9db..bb602763d02 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 9b2c1df0e07..85ac49e19dc 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 35 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 36 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */ -- 2.47.3