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 519a79f6398e506a5d899d0ba1df375b7ae7e8ea..104ba6b6d75b6a2cc62d4020405f4dbc7e2e7ff3 100644 (file)
--- 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 7605ff2ef7a5839ed01544028cd14de400524783..0e81d6b1e9bdecfe44f9578f93bbe48b4f3992f5 100644 (file)
--- 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 39ba0e509a02c7aa393acbc65fc3233561afbbfb..fc43c453c204578e5887fa0e2a79226d2658900d 100644 (file)
--- 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"