From: Paul Querna <pquerna@apache.org>
Date: Thu, 21 Jan 2010 22:04:29 +0000 (+0000)
Subject: roll on to 2.3.6-dev
X-Git-Tag: 2.3.6~563
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f93309cb98baeac4ca4f9d6035b9ddf77e57735b;p=apache

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 fd365c682a..0126552f5b 100644
--- 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 58e8b94ae9..dec2d58306 100644
--- 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 fa1d53f7e7..30aaae1220 100644
--- 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"