Backport r264759 and r264788 to the 2.2.x branch. Fixes the get_suexec_identity hook

for mod_cgid.

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

diff --git a/CHANGES b/CHANGES
index d165b138618622c31061b4258c36af21c0e26831..420179e3e4c551ddd650a03d89e51a576e223761 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -24,9 +24,6 @@ Changes with Apache 2.3.0
      enforced in per-location context if "SSLVerifyClient optional"
      was configured in the vhost configuration.  [Joe Orton]
 
-  *) mod_cgid: run the get_suexec_identity hook within the request-handler 
-     instead of within cgid. PR 36410. [Colm MacCarthaigh]
-
   *) Doxygen fixup [Neale Ranns <neale ranns.org>, Ian Holsman]
 
   *) prefork, worker and event MPMs: Support a graceful-stop procedure:
@@ -52,6 +49,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.8
 
+  *) mod_cgid: run the get_suexec_identity hook within the request-handler 
+     instead of within cgid. PR 36410. [Colm MacCarthaigh]
+
   *) Linux 2.0: remove support for threaded MPM's due to linuxthreads use
      of SIGUSR1 clashing with graceful restart signal. [Colm MacCarthaigh]