From: Daniel Ruggeri Date: Sat, 17 Mar 2018 23:41:25 +0000 (+0000) Subject: Post 2.4.33 tag updates X-Git-Tag: 2.4.34~286 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4700baa44993b0dc52b81f98c9e5b4f95fc43ed7;p=apache Post 2.4.33 tag updates git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1827120 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 54301530f7..963411b75d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.34 + Changes with Apache 2.4.33 *) core: Fix request timeout logging and possible crash for error_log hooks. diff --git a/STATUS b/STATUS index 652bd11344..16d6e0f75f 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.33 : In development + 2.4.34 : In development + 2.4.33 : Tagged on March 17, 2018 2.4.32 : Tagged on March 09, 2018. Released on March 15, 2017 (not announced) 2.4.31 : Tagged on March 03, 2018, not released 2.4.30 : Tagged on February 19, 2018, not released. diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index 6e21f89283..786d47002e 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 4ade5e4e74..1711420465 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 33 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 34 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */