Commit 889e95ab authored by Graham Leggett's avatar Graham Leggett
Browse files

Backport: Fix the global mutex crash when the global mutex is never allocated 

due to disabled/empty caches.
PR:
Obtained from:
Submitted by:	Jess Holle
Reviewed by:	minfrin, bnicholes, trawick


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

CHANGES

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













  *) Fix the global mutex crash when the global mutex is never allocated













     due to disabled/empty caches. [Jess Holle <jessh ptc.com>]



























  *) Fix a segfault in the LDAP cache when it is configured switched















     off. [Jess Holle <jessh ptc.com>]















































STATUS



+1
−6






























Original line number
Diff line number
Diff line















APACHE 2.0 STATUS:                                              -*-text-*-













Last modified at [$Date: 2004/09/23 16:58:17 $]













Last modified at [$Date: 2004/09/23 17:08:25 $]































Release:


























@@ -92,11 +92,6 @@ PATCHES TO BACKPORT FROM 2.1













       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c?r1=1.152&r2=1.153















       +1: jorton, jerenkrantz, trawick





























    *) Fix the global mutex crash when the global mutex is never allocated













       due to disabled/empty caches.













         modules/ldap/util_ldap.c: 1.13













       +1: minfrin, bnicholes, trawick





























    *) Fix a segfault in the LDAP cache purge. PR 24801















         modules/ldap/util_ldap_cache_mgr.c: 1.9, 1.10















       +1: minfrin, bnicholes

































modules/experimental/util_ldap.c



+4
−2






























Original line number
Diff line number
Diff line








@@ -89,8 +89,10 @@ void *util_ldap_create_config(apr_pool_t *p, server_rec *s);













#endif































#define LDAP_CACHE_LOCK() \













    if (st->util_ldap_cache_lock) \















      apr_global_mutex_lock(st->util_ldap_cache_lock)















#define LDAP_CACHE_UNLOCK() \













    if (st->util_ldap_cache_lock) \















      apr_global_mutex_unlock(st->util_ldap_cache_lock)