httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental util_ldap.c
Date Fri, 02 Apr 2004 23:17:29 GMT
bnicholes    2004/04/02 15:17:29

  Modified:    modules/experimental util_ldap.c
  Log:
  Stop locking all of the connections while trying to find an available connection that meets
the specified criteria.  If a connection doesn't meet the criteria, unlock it so that it remains
available for other requests.
  
  Revision  Changes    Path
  1.23      +26 -18    httpd-2.0/modules/experimental/util_ldap.c
  
  Index: util_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- util_ldap.c	31 Mar 2004 22:56:08 -0000	1.22
  +++ util_ldap.c	2 Apr 2004 23:17:29 -0000	1.23
  @@ -362,18 +362,22 @@
        */
       for (l=st->connections,p=NULL; l; l=l->next) {
   #if APR_HAS_THREADS
  -        if ( (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) &&
  -#else
  -        if (
  +        if (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) {
   #endif
  -            l->port == port
  -	    && strcmp(l->host, host) == 0
  -	    && ( (!l->binddn && !binddn) || (l->binddn && binddn
&& !strcmp(l->binddn, binddn)) )
  -	    && ( (!l->bindpw && !bindpw) || (l->bindpw && bindpw
&& !strcmp(l->bindpw, bindpw)) )
  -            && l->deref == deref
  -            && l->secure == secure 
  -            )
  +        if ((l->port == port) && (strcmp(l->host, host) == 0) &&

  +            ((!l->binddn && !binddn) || (l->binddn && binddn &&
!strcmp(l->binddn, binddn))) && 
  +            ((!l->bindpw && !bindpw) || (l->bindpw && bindpw &&
!strcmp(l->bindpw, bindpw))) && 
  +            (l->deref == deref) && (l->secure == secure)) {
  +
               break;
  +        }
  +#if APR_HAS_THREADS
  +            /* If this connection didn't match the criteria, then we
  +             * need to unlock the mutex so it is available to be reused.
  +             */
  +            apr_thread_mutex_unlock(l->lock);
  +        }
  +#endif
           p = l;
       }
   
  @@ -383,21 +387,25 @@
       if (!l) {
           for (l=st->connections,p=NULL; l; l=l->next) {
   #if APR_HAS_THREADS
  -            if ( (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) &&
  -#else
  -            if (
  +            if (APR_SUCCESS == apr_thread_mutex_trylock(l->lock)) {
  +
   #endif
  -                l->port == port
  -	        && strcmp(l->host, host) == 0
  -                && l->deref == deref
  -                && l->secure == secure
  -                ) {
  +            if ((l->port == port) && (strcmp(l->host, host) == 0) &&

  +                (l->deref == deref) && (l->secure == secure)) {
  +
                   /* the bind credentials have changed */
                   l->bound = 0;
                   l->binddn = apr_pstrdup(st->pool, binddn);
                   l->bindpw = apr_pstrdup(st->pool, bindpw);
                   break;
               }
  +#if APR_HAS_THREADS
  +                /* If this connection didn't match the criteria, then we
  +                 * need to unlock the mutex so it is available to be reused.
  +                 */
  +                apr_thread_mutex_unlock(l->lock);
  +            }
  +#endif
               p = l;
           }
       }
  
  
  

Mime
View raw message