From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Wed, 23 Feb 2005 06:29:31 +0000 (+0000)
Subject: Onward ho to 2.1.4.
X-Git-Tag: 2.1.4~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=249b7dfcbbc32a20467d1b410200e7bbce726f04;p=thirdparty%2Fapache%2Fhttpd.git

Onward ho to 2.1.4.

* CHANGES: Bump.
* include/ap_release.h: Bump.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154973 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1e40e235a7e..c5961b9e121 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,9 @@
-Changes with Apache 2.1.3
+Changes with Apache 2.1.4
 
   [Remove entries to the current 2.0 section below, when backported]
 
+Changes with Apache 2.1.3
+
   *) core_input_filter: Move buckets to a persistent brigade instead of
      creating a new brigade when apr_brigade_split is called. This stops
      a memory leak when proxying a Streaming Media Server. PR 33382.
diff --git a/include/ap_release.h b/include/ap_release.h
index 2c9e12cf146..7628d6d943b 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -42,8 +42,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 1
-#define AP_SERVER_PATCHLEVEL_NUMBER   3
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   4
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"