Commit 5cf7e15a authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

merge r265737 from trunk. 

Author: trawick
Reviewed by: colm


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

CHANGES

+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]









  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as









     in 1.3.  [Jeff Trawick]

















  *) mod_log_config: %{hextid}P will log the thread id in hex with APR









     versions 1.2.0 or higher.  [Jeff Trawick]


















@@ -18,6 +15,9 @@ Changes with Apache 2.3.0















Changes with Apache 2.1.9

















  *) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as









     in 1.3.  [Jeff Trawick]

















  *) Support dbd connections tied to the conn_rec [Nick Kew]

















  *) Move mod_dbd to /modules/database/ [Nick Kew]