From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 17 May 2021 21:10:19 +0000 (+0000)
Subject: Post 2.4.48 tag updates
X-Git-Tag: candidate-2.4.49~3^2~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3db24ff775415d4abd66f1241f3337eab27bd96b;p=thirdparty%2Fapache%2Fhttpd.git

Post 2.4.48 tag updates

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1889976 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index ccdc021a613..7256c1db243 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache 2.4.49
+
 Changes with Apache 2.4.48
 
   *) mod_proxy_wstunnel: Add ProxyWebsocketFallbackToProxyHttp to opt-out the
diff --git a/STATUS b/STATUS
index eb4fcbab825..7d013f18273 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.48  : In development
+    2.4.49  : In development
+    2.4.48  : Tagged on mai 17, 2021
     2.4.47  : Tagged on April 22, 2021. Distributed on April 28, 2021,
               not announced.
     2.4.46  : Tagged on August 01, 2020. Released on August 07, 2020.
diff --git a/docs/manual/style/version.ent b/docs/manual/style/version.ent
index e5099476e63..37341395f60 100644
--- a/docs/manual/style/version.ent
+++ b/docs/manual/style/version.ent
@@ -19,6 +19,6 @@
 
 <!ENTITY httpd.major "2">
 <!ENTITY httpd.minor "4">
-<!ENTITY httpd.patch "48">
+<!ENTITY httpd.patch "49">
 
 <!ENTITY httpd.docs "2.4">
diff --git a/include/ap_release.h b/include/ap_release.h
index d08ca3bc36e..f59c0a3b77f 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   48
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   49
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 /* Synchronize the above with docs/manual/style/version.ent */