Commit 2e97dbf3 authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_ldap: prevent the possiblity of an infinite loop in the LDAP 

statistics display.
PR:	29216
Obtained from:
Submitted by:
Reviewed by:	minfrin, bnicholes, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105428 13f79535-47bb-0310-9956-ffa450edef68
parent 66daf05e

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.53













  *) mod_ldap: prevent the possiblity of an infinite loop in the LDAP













     statistics display. PR 29216 [Graham Leggett]



























  *) mod_ldap: fix a bogus error message to tell the user which file















     is causing a potential problem with the LDAP shared memory cache.















     PR 31431 [Graham Leggett]

































STATUS



+1
−7






























Original line number
Diff line number
Diff line















APACHE 2.0 STATUS:                                              -*-text-*-













Last modified at [$Date: 2004/10/13 15:29:44 $]













Last modified at [$Date: 2004/10/13 16:19:34 $]































Release:


























@@ -103,12 +103,6 @@ PATCHES TO BACKPORT FROM 2.1













       PR 24437















       +1: minfrin





























    *) mod_ldap: prevent the possiblity of an infinite loop in the LDAP













       statistics display.













         modules/ldap/util_ldap_cache_mgr.c: 1.11













       PR 29216













       +1: minfrin, bnicholes, jim





























    *) apxs: fix handling of -Wc/-Wl and "-o mod_foo.so".















         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/apxs.in?r1=1.62&r2=1.64















       PR: 31448

































modules/experimental/util_ldap_cache_mgr.c



+5
−2






























Original line number
Diff line number
Diff line








@@ -469,10 +469,13 @@ char *util_ald_cache_display_stats(request_rec *r, util_ald_cache_t *cache, char













    for (i=0; i < cache->size; ++i) {















        if (cache->nodes[i] != NULL) {















            nchains++;













            for (n = cache->nodes[i]; n != NULL; n = n->next)













            for (n = cache->nodes[i];













                 n != NULL && n != n->next;













                 n = n->next) {















            	totchainlen++;















            }















        }













    }















    chainlen = nchains? (double)totchainlen / (double)nchains : 0;































    if (id) {