View | Details | Raw Unified | Return to bug 63305
Collapse All | Expand All

(-)modules/ldap/util_ldap.c (+14 lines)
Lines 2917-2922 Link Here
2917
    return OK;
2917
    return OK;
2918
}
2918
}
2919
2919
2920
static apr_status_t util_ldap_cache_module_kill_locked(void *data)
2921
{
2922
    apr_status_t result;
2923
    util_ldap_state_t *st = data;
2924
2925
    LDAP_CACHE_LOCK();
2926
    result = util_ldap_cache_module_kill(data);
2927
    LDAP_CACHE_UNLOCK();
2928
2929
    return result;
2930
}
2931
2920
static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
2932
static int util_ldap_post_config(apr_pool_t *p, apr_pool_t *plog,
2921
                                 apr_pool_t *ptemp, server_rec *s)
2933
                                 apr_pool_t *ptemp, server_rec *s)
2922
{
2934
{
Lines 2963-2968 Link Here
2963
                         "LDAP cache: could not create shared memory segment");
2975
                         "LDAP cache: could not create shared memory segment");
2964
            return DONE;
2976
            return DONE;
2965
        }
2977
        }
2978
2979
        apr_pool_cleanup_register(st->pool, st , util_ldap_cache_module_kill_locked, apr_pool_cleanup_null);
2966
2980
2967
        result = ap_global_mutex_create(&st->util_ldap_cache_lock, NULL,
2981
        result = ap_global_mutex_create(&st->util_ldap_cache_lock, NULL,
2968
                                        ldap_cache_mutex_type, NULL, s, p, 0);
2982
                                        ldap_cache_mutex_type, NULL, s, p, 0);
(-)modules/ldap/util_ldap_cache.c (-2 / +2 lines)
Lines 397-403 Link Here
397
397
398
398
399
/* ------------------------------------------------------------------ */
399
/* ------------------------------------------------------------------ */
400
static apr_status_t util_ldap_cache_module_kill(void *data)
400
apr_status_t util_ldap_cache_module_kill(void *data)
401
{
401
{
402
    util_ldap_state_t *st = data;
402
    util_ldap_state_t *st = data;
403
403
Lines 449-455 Link Here
449
449
450
#endif
450
#endif
451
451
452
    apr_pool_cleanup_register(st->pool, st , util_ldap_cache_module_kill, apr_pool_cleanup_null);
452
    //apr_pool_cleanup_register(st->pool, st , util_ldap_cache_module_kill, apr_pool_cleanup_null);
453
453
454
    st->util_ldap_cache =
454
    st->util_ldap_cache =
455
        util_ald_create_cache(st,
455
        util_ald_create_cache(st,
(-)include/util_ldap.h (+2 lines)
Lines 381-386 Link Here
381
 */
381
 */
382
apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st);
382
apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st);
383
383
384
apr_status_t util_ldap_cache_module_kill(void *data);
385
384
/* from apr_ldap_cache_mgr.c */
386
/* from apr_ldap_cache_mgr.c */
385
387
386
/**
388
/**

Return to bug 63305