Backport r265506, r240044 and r240049 to the 2.2.x branch; Appends .PID to the

ScriptSock filename.

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

diff --git a/CHANGES b/CHANGES
index 420179e3e4c551ddd650a03d89e51a576e223761..64ccebaab462c2517f4517342713bc2a6b5a7be4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -31,9 +31,6 @@ Changes with Apache 2.3.0
      "GracefulShutdownTimeout" number of seconds before exiting. 
      [Colm MacCarthaigh, Ken Coar, Bill Stoddard]
 
-  *) mod_cgid: Append .PID to the script socket filename and remove the
-     script socket on exit. [Colm MacCarthaigh]
-
   *) prefork, worker and event MPMs: Prevent children from holding open 
      listening ports upon graceful restart or stop. PR 28167. 
      [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]
@@ -49,6 +46,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.8
 
+  *) mod_cgid: Append .PID to the script socket filename and remove the
+     script socket on exit. [Colm MacCarthaigh, Jim Jagielski]
+
   *) mod_cgid: run the get_suexec_identity hook within the request-handler 
      instead of within cgid. PR 36410. [Colm MacCarthaigh]