From: Bill Stoddard Date: Thu, 26 Aug 2004 01:07:41 +0000 (+0000) Subject: another backport X-Git-Tag: STRIKER_2_1_0_RC1~31 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6117223cc4a773403b836e9f607982a37bcf4f7e;p=apache another backport git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104809 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 3cf218b44d..a34cb11719 100644 --- a/CHANGES +++ b/CHANGES @@ -29,9 +29,6 @@ Changes with Apache 2.1.0-dev *) Add test_config hook, run only if httpd is invoked using -t. [Joe Orton] - *) WinNT MPM: Fix a broken log message at termination. PR 28063. - [Eider Oliveira ] - *) Improve error handling for corrupted pid files. [Jeff Trawick] *) mod_proxy.c and proxy_util.c: Enable compiling on 2.0-HEAD @@ -420,6 +417,9 @@ Changes with Apache 2.1.0-dev Changes with Apache 2.0.51 + *) WinNT MPM: Fix a broken log message at termination. PR 28063. + [Eider Oliveira ] + *) Prevent Win32 pool corruption at startup [Allan Edwards] *) mod_ssl: Add "SSLUserName" directive to set r->user based on a