Welcome to .33-dev.

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

diff --git a/CHANGES b/CHANGES
index 51900cbe7ff486737dc4a26f1d7293bacc444a26..afc7d0f537617b4bb939dc054bddb95b4076eb32 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+Changes with Apache 2.0.33-dev
+
+  *) Fix a bug in mod_cgid that would prevent proper shutdown death
+     of the cgid process.  [Aaron Bannert]
+
+  *) Add signal handling back in to the worker MPM for the one_process
+     (-X, -DDEBUG, -DONE_PROCESS) case.  [Aaron Bannert]
+
+  *) Performance: Reuse per-connection transaction pools in the
+     worker MPM, rather than destroying and recreating them.  [Brian Pane]
+
+  *) Remove all signals from the worker MPM's child process.  Instead,
+     the parent uses the Pipe of Death for all communication with the
+     child processes.  [Ryan Bloom]
+
 Changes with Apache 2.0.32
 
   *) mod_negotiation: ForceLanguagePriority now uses 'Prefer' as the

diff --git a/include/ap_release.h b/include/ap_release.h
index 74644a050ff3786b1cc7dd8e3640bb3760bfa114..7ce3a52c9cf97f40e7f708b84b27add070b381bc 100644 (file)
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -73,7 +73,7 @@
  */
 #define AP_SERVER_BASEVENDOR "Apache Software Foundation"
 #define AP_SERVER_BASEPRODUCT "Apache"
-#define AP_SERVER_BASEREVISION "2.0.32"
+#define AP_SERVER_BASEREVISION "2.0.33-dev"
 #define AP_SERVER_BASEVERSION AP_SERVER_BASEPRODUCT "/" AP_SERVER_BASEREVISION
 #define AP_SERVER_VERSION  AP_SERVER_BASEVERSION