From: Colm MacCarthaigh <colm@apache.org>
Date: Sun, 18 Sep 2005 19:39:02 +0000 (+0000)
Subject: Backport r239430 to the 2.2.x branch. Lets make sure WINCH is kept free.
X-Git-Tag: 2.3.0~3001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68ab9b094cf5f3e977a4dd60e07f0f268e8319f1;p=apache

Backport r239430 to the 2.2.x branch. Lets make sure WINCH is kept free.



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

diff --git a/CHANGES b/CHANGES
index 49c7050a77..d165b13861 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,9 +41,6 @@ Changes with Apache 2.3.0
      listening ports upon graceful restart or stop. PR 28167. 
      [Colm MacCarthaigh, Brian Pinkerton <bp thinkpink.com>]
 
-  *) Linux 2.0: remove support for threaded MPM's due to linuxthreads use
-     of SIGUSR1 clashing with graceful restart signal. [Colm MacCarthaigh]
-
   *) mod_cache: Enhance CacheEnable/CacheDisable to control caching on a
      per-protocol, per-host and per-path basis. Intended for proxy
      configurations. [Colm MacCarthaigh]
@@ -53,7 +50,13 @@ Changes with Apache 2.3.0
      access control, as in: SSLRequire "value" in OID("1.3.6.1.4.1.18060.1")
      [Martin Kraemer, David Reid]
 
+Changes with Apache 2.1.8
+
+  *) Linux 2.0: remove support for threaded MPM's due to linuxthreads use
+     of SIGUSR1 clashing with graceful restart signal. [Colm MacCarthaigh]
+
 Changes with Apache 2.1.7
+
   *) SECURITY: CAN-2005-2491 (cve.mitre.org): 
      Fix integer overflows in PCRE in quantifier parsing which could
      be triggered by a local user through use of a carefully-crafted