sync with 2.2.x

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

diff --git a/CHANGES b/CHANGES
index b5b12e1923a9a8931e2726d8dca7beaf7e7adab0..34367d4be1dc7d67d1c5ae95ded4dcec8f1cdaa5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,14 +2,6 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
-  *) mod_cgid: Explicitly set permissions of the socket (ScriptSock) shared by
-     mod_cgid and request processing threads, for OS'es such as HP-UX and AIX
-     that do not use umask for AF_UNIX socket permissions.
-     [Eric Covener, Jeff Trawick]
-
-  *) mod_cgid: Don't try to restart the daemon if it fails to initialize
-     the socket.  [Jeff Trawick]
-
   *) core: Do not allow Options ALL if not all options are allowed to be
      overwritten. PR 44262 [Michał Grzędzicki <lazy iq.pl>]