From: Daniel Ruggeri Date: Wed, 10 Oct 2018 19:11:42 +0000 (+0000) Subject: Post 2.4.36 tag updates X-Git-Tag: 2.4.37~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71218e534d1dcc03f77cb4a3aa3cd63ad2ae27c6;p=thirdparty%2Fapache%2Fhttpd.git Post 2.4.36 tag updates git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1843493 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 99f80843423..60c53801232 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.37 + Changes with Apache 2.4.36 *) mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified diff --git a/STATUS b/STATUS index d7d4680254b..b20eb2d3df0 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.36 : In development + 2.4.37 : In development + 2.4.36 : Tagged on October 10, 2018 2.4.35 : Tagged on September 17, 2018. Released on September 22, 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. diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent index bb602763d02..cc6c3921bda 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 cf195673eab..cb8bf038e56 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 36 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 37 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 /* Synchronize the above with docs/manual/style/version.ent */