roll on to 2.3.6-dev

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

diff --git a/CHANGES b/CHANGES
index fd365c682a1ac259ad01529ecb3daf8829924fbe..0126552f5bb7b26faf2c2b1bdd9fb8245e81157e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                         -*- coding: utf-8 -*-
 
+Changes with Apache 2.3.6
+
 Changes with Apache 2.3.5
 
   *) Ensure each subrequest has a shallow copy of headers_in so that the

diff --git a/STATUS b/STATUS
index 58e8b94ae92c3644c9bd411eec1527459d708dd5..dec2d58306dd09b7aea730c5d66ca6c5dd8a2bb4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -26,6 +26,7 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
+    2.3.5   : Tagged on January 21, 2010.
     2.3.4   : Tagged on November 24, 2009.
     2.3.3   : Tagged on November 11, 2009, not released.
     2.3.2   : Tagged on March 23, 2009, not released.

diff --git a/include/ap_release.h b/include/ap_release.h
index fa1d53f7e7bc28fee220b48f88296dd81b36401c..30aaae1220548f8137beaf1c14b176499ae9e2c0 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -45,8 +45,8 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 3
-#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"