sync

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

diff --git a/CHANGES b/CHANGES
index 5a74c84398a3d3bb6124086870611fe459250caa..da9b70cbc3b41f933d1bcc01dad7fbfff54d7a72 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,8 +17,6 @@ Changes with Apache 2.1.0-dev
      instead of db3. Fixed complaints about unpackaged files.
      [Graham Leggett]
 
-  *) Fix handling of IPv6 numeric strings in mod_proxy.  [Jeff Trawick]
-
   *) External rewrite map responses are no longer limited to 2048
      bytes.  [André Malo]
 
@@ -148,9 +146,6 @@ Changes with Apache 2.1.0-dev
      AUTH_GENERAL_ERROR.
      [Geoffrey Young]
 
-  *) mod_isapi: send_response_header() failed to copy status string's 
-     last character.  PR 20619.  [Jesse Pelton <jsp pkc.com>]
-
   *) The whole codebase was relicensed and is now available under
      the Apache License, Version 2.0 (http://www.apache.org/licenses).
      [Apache Software Foundation]
@@ -161,9 +156,6 @@ Changes with Apache 2.1.0-dev
   *) Delete some make-generated files in the server directory during 
      "make clean" processing.  PR 26552.  [Jeff Trawick]
 
-  *) Unix MPMs: Stop dropping connections when the file descriptor
-     is at least FD_SETSIZE.  [Jeff Trawick]
-
   *) Add core version query function (ap_get_server_revision) and
      accompanying ap_version_t structure (minor MMN bump).
      [André Malo]
@@ -383,6 +375,19 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) Regression from 1.3: At startup, suexec now will be checked for
+     availability, the setuid bit and user root. The works only if
+     httpd is compiled with the shipped APR version (0.9.5).
+     [André Malo]
+
+  *) Unix MPMs: Stop dropping connections when the file descriptor
+     is at least FD_SETSIZE.  [Jeff Trawick]
+
+  *) Fix handling of IPv6 numeric strings in mod_proxy.  [Jeff Trawick]
+
+  *) mod_isapi: send_response_header() failed to copy status string's 
+     last character.  PR 20619.  [Jesse Pelton <jsp pkc.com>]
+
   *) Fix a segfault when requests for shared memory fails and returns
      NULL. Fix a segfault caused by a lack of bounds checking on the
      cache. PR 24801 [Graham Leggett]