summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--STATUS3
-rw-r--r--include/ap_release.h4
3 files changed, 7 insertions, 5 deletions
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"