Commit f9ec7a3b authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Merge r265033 from trunk.

Author: trawick
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@312911 13f79535-47bb-0310-9956-ffa450edef68
parent 5cf7e15a
Loading
Loading
Loading
Loading
+3 −3
Changes for CHANGES: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@
Changes with Apache 2.3.0
  [Remove entries to the current 2.0 and 2.2 section below, when backported]
  *) mod_log_config: %{hextid}P will log the thread id in hex with APR
     versions 1.2.0 or higher.  [Jeff Trawick]
  *) mod_cgid: Refuse to work on Solaris 10 due to OS bugs.  PR 34264.
     [Justin Erenkrantz]
@@ -15,6 +12,9 @@ Changes with Apache 2.3.0
Changes with Apache 2.1.9
  *) mod_log_config: %{hextid}P will log the thread id in hex with APR
     versions 1.2.0 or higher.  [Jeff Trawick]
  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
     in 1.3.  [Jeff Trawick]