From: Graham Leggett Date: Fri, 22 Nov 2002 12:40:48 +0000 (+0000) Subject: Grrr... CHANGES file didn't commit :( X-Git-Tag: pre_ajp_proxy~2574 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8ccd34c6de0e2c92113c86394951df58e168f2d;p=apache Grrr... CHANGES file didn't commit :( PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97597 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 26430a327b..3570e2d980 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,11 @@ Changes with Apache 2.0.44 + *) Reorder the definitions for mod_ldap and mod_auth_ldap within + config.m4 to make sure the parent mod_ldap is defined first. + This ensures that mod_ldap comes before mod_auth_ldap in the + httpd.conf file, which is necessary for mod_auth_ldap to load. + [Graham Leggett] + *) Fix critical bug in new --enable-v4-mapped configure option implementation which broke IPv4 listening sockets on some systems. [hiroyuki hanai ] @@ -16,6 +22,7 @@ Changes with Apache 2.0.44 the else path (using the default expiration) if date is equal to lastmod. [rx@armstrike.com (Sergey), Paul J. Reder] +>>>>>>> 1.989 *) Use AP_DECLARE in the debug versions of ap_strXXX in case the default calling convention is not the same as the one used by AP_DECLARE. [Juan Rivera ]