Commit e4aa0108 authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1635970 from 2.4.x: 

Merge r1633031, r1633522, r1633529, r1633530 from trunk

Style fix

Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36


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

modules/ldap/util_ldap_cache_mgr.c

+5 −3
Original line number Diff line number Diff line
@@ -298,8 +298,10 @@ util_ald_cache_t *util_ald_create_cache(util_ldap_state_t *st, 
    cache->maxentries = cache_size;

    cache->numentries = 0;

    cache->size = cache_size / 3;

    if (cache->size < 64) cache->size = 64;

        for (i = 0; primes[i] && primes[i] < cache->size; ++i) ;

    if (cache->size < 64)

        cache->size = 64;

    for (i = 0; primes[i] && primes[i] < cache->size; ++i)

        ;

    cache->size = primes[i] ? primes[i] : primes[i-1];



    cache->nodes = (util_cache_node_t **)util_ald_alloc(cache, cache->size * sizeof(util_cache_node_t *));

modules/dav/main/mod_dav.c

+2 −2

File changed.

Contains only whitespace changes.

modules/proxy/mod_proxy_ftp.c

+26 −26

File changed.

Contains only whitespace changes.

modules/ssl/ssl_engine_io.c

+1 −1

File changed.

Contains only whitespace changes.