httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0/modules/ldap util_ldap.c
Date Sun, 19 Sep 2004 23:11:10 GMT
minfrin     2004/09/19 16:11:10

  Modified:    .        CHANGES
               modules/ldap util_ldap.c
  Log:
  Fix the global mutex crash when the global mutex is never allocated due
  to disabled/empty caches.
  Submitted by:	Jess Holle <jessh ptc.com>
  
  Revision  Changes    Path
  1.1593    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1592
  retrieving revision 1.1593
  diff -u -r1.1592 -r1.1593
  --- CHANGES	19 Sep 2004 23:00:25 -0000	1.1592
  +++ CHANGES	19 Sep 2004 23:11:10 -0000	1.1593
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) 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 purge. [Jess Holle <jessh ptc.com>]
   
     *) mod_rewrite: Handle per-location rules when r->filename is unset.
  
  
  
  1.13      +4 -2      httpd-2.0/modules/ldap/util_ldap.c
  
  Index: util_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ldap/util_ldap.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- util_ldap.c	13 Sep 2004 10:59:55 -0000	1.12
  +++ util_ldap.c	19 Sep 2004 23:11:10 -0000	1.13
  @@ -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)
  
  
  

Mime
View raw message