From: Paul Querna <pquerna@apache.org>
Date: Fri, 17 Jun 2005 07:03:13 +0000 (+0000)
Subject: Onward to 2.1.6-dev!
X-Git-Tag: 2.1.6~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e6e500225d03e258612a8aef9f6bf48571538c5;p=apache

Onward to 2.1.6-dev!


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

diff --git a/CHANGES b/CHANGES
index 519a79f639..104ba6b6d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
-Changes with Apache 2.1.5
-
+Changes with Apache 2.1.6
   [Remove entries to the current 2.0 section below, when backported]
 
+Changes with Apache 2.1.5
+
   *) SECURITY: 
      core: If a request contains both Transfer-Encoding and a Content-Length,
      remove the Content-Length, stopping some HTTP Request smuggling attacks.
diff --git a/STATUS b/STATUS
index 7605ff2ef7..0e81d6b1e9 100644
--- a/STATUS
+++ b/STATUS
@@ -7,7 +7,8 @@ http://svn.apache.org/repos/asf/httpd/httpd/trunk/STATUS
 Release history:
     [NOTE that only Alpha/Beta releases occur in 2.1 development]
 
-    2.1.5   : in development
+    2.1.6   : in development
+    2.1.5   : Tagged on 6/17/2005. 
     2.1.4   : not released.
     2.1.3   : Released on  2/22/2005 as alpha.
     2.1.2   : Released on 12/08/2004 as alpha.
diff --git a/include/ap_release.h b/include/ap_release.h
index 39ba0e509a..fc43c453c2 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   5
-#define AP_SERVER_DEVBUILD_BOOLEAN    0
+#define AP_SERVER_PATCHLEVEL_NUMBER   6
+#define AP_SERVER_DEVBUILD_BOOLEAN    1
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
 #define AP_SERVER_ADD_STRING          "-dev"