You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2004/09/23 19:08:27 UTC
cvs commit: httpd-2.0/modules/experimental util_ldap.c
minfrin 2004/09/23 10:08:27
Modified: . Tag: APACHE_2_0_BRANCH CHANGES STATUS
modules/experimental Tag: APACHE_2_0_BRANCH util_ldap.c
Log:
Backport: Fix the global mutex crash when the global mutex is never allocated
due to disabled/empty caches.
Submitted by: Jess Holle
Reviewed by: minfrin, bnicholes, trawick
Revision Changes Path
No revision
No revision
1.988.2.359 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.358
retrieving revision 1.988.2.359
diff -u -r1.988.2.358 -r1.988.2.359
--- CHANGES 23 Sep 2004 16:55:34 -0000 1.988.2.358
+++ CHANGES 23 Sep 2004 17:08:24 -0000 1.988.2.359
@@ -1,5 +1,8 @@
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>]
1.751.2.1082 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.1081
retrieving revision 1.751.2.1082
diff -u -r1.751.2.1081 -r1.751.2.1082
--- STATUS 23 Sep 2004 16:58:17 -0000 1.751.2.1081
+++ STATUS 23 Sep 2004 17:08:25 -0000 1.751.2.1082
@@ -92,11 +92,6 @@
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
No revision
No revision
1.6.2.23 +4 -2 httpd-2.0/modules/experimental/Attic/util_ldap.c
Index: util_ldap.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/Attic/util_ldap.c,v
retrieving revision 1.6.2.22
retrieving revision 1.6.2.23
diff -u -r1.6.2.22 -r1.6.2.23
--- util_ldap.c 26 Aug 2004 22:21:33 -0000 1.6.2.22
+++ util_ldap.c 23 Sep 2004 17:08:27 -0000 1.6.2.23
@@ -89,9 +89,11 @@
#endif
#define LDAP_CACHE_LOCK() \
- apr_global_mutex_lock(st->util_ldap_cache_lock)
+ if (st->util_ldap_cache_lock) \
+ apr_global_mutex_lock(st->util_ldap_cache_lock)
#define LDAP_CACHE_UNLOCK() \
- apr_global_mutex_unlock(st->util_ldap_cache_lock)
+ if (st->util_ldap_cache_lock) \
+ apr_global_mutex_unlock(st->util_ldap_cache_lock)
static void util_ldap_strdup (char **str, const char *newstr)