Commit 45fe7c1e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Apply approved backport 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@527105 13f79535-47bb-0310-9956-ffa450edef68
parent 87aeea7a

CHANGES

+5 −0
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.5













   * mod_ldap: Remove the hardcoded size limit parameter for













     ldap_search_ext_s and replace it with an APR_ defined













     value that is set according to the LDAP SDK being used.













     [David Jones <oscaremma gmail com>]



























  *) core: Correct a regression since 2.0.x in the handling of AllowOverride 















     Options.  PR 41829.  [Torsten Förtsch <torsten.foertsch gmx.net>]















































STATUS



+0
−6






























Original line number
Diff line number
Diff line








@@ -77,12 +77,6 @@ RELEASE SHOWSTOPPERS:













PATCHES ACCEPTED TO BACKPORT FROM TRUNK:















  [ start all new proposals below, under PATCHES PROPOSED. ]





























   * mod_ldap: Remove the hardcoded size limit parameter for 













       ldap_search_ext_s and replace it with an APR_ defined 













       value that is set according to the LDAP SDK being used.













     http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?r1=484985&r2=517788













     +1: bnicholes, rpluem, jim





























   * mod_proxy_balancer: Remove unnecessary lock/unlock for















     the post_request hook. We are actually doing nothing here.















     But keep the code (but macroed out) for future usage.

































modules/ldap/util_ldap.c



+11
−3






























Original line number
Diff line number
Diff line








@@ -52,6 +52,14 @@













#define LDAP_CA_TYPE_BASE64             2















#define LDAP_CA_TYPE_CERT7_DB           3





























/* Default define for ldap functions that need a SIZELIMIT but













 * do not have the define













 * XXX This should be removed once a supporting #define is 













 *  released through APR-Util.













 */













#ifndef APR_LDAP_SIZELIMIT













#define APR_LDAP_SIZELIMIT -1













#endif































module AP_MODULE_DECLARE_DATA ldap_module;


























@@ -656,7 +664,7 @@ start_over:













    /* search for reqdn */















    if ((result = ldap_search_ext_s(ldc->ldap, (char *)reqdn, LDAP_SCOPE_BASE,















                                    "(objectclass=*)", NULL, 1,













                                    NULL, NULL, NULL, -1, &res))













                                    NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res))















            == LDAP_SERVER_DOWN)















    {















        ldc->reason = "DN Comparison ldap_search_ext_s() "










@@ -934,7 +942,7 @@ start_over:













    if ((result = ldap_search_ext_s(ldc->ldap,















                                    (char *)basedn, scope,















                                    (char *)filter, attrs, 0,













                                    NULL, NULL, NULL, -1, &res))













                                    NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res))















            == LDAP_SERVER_DOWN)















    {















        ldc->reason = "ldap_search_ext_s() for user failed with server down";










@@ -1174,7 +1182,7 @@ start_over:













    if ((result = ldap_search_ext_s(ldc->ldap,















                                    (char *)basedn, scope,















                                    (char *)filter, attrs, 0,













                                    NULL, NULL, NULL, -1, &res))













                                    NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res))















            == LDAP_SERVER_DOWN)















    {















        ldc->reason = "ldap_search_ext_s() for user failed with server down";