From: Jeff Trawick <trawick@apache.org>
Date: Fri, 9 May 2008 12:20:24 +0000 (+0000)
Subject: sync with 2.2.x
X-Git-Tag: 2.3.0~657
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20da8249eb1a803d5c1a5120ac8791a8b1723d3a;p=thirdparty%2Fapache%2Fhttpd.git

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 b5b12e1923a..34367d4be1d 100644
--- 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>]