apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@rowe-clan.net>
Subject Re: svn commit: r667182 - in /apr/apr-util/trunk: Makefile.win aprutil.dsw dbd/apr_dbd.c dbd/apr_dbd_odbc.c dbd/apr_dbd_odbc.dsp include/apu.hw include/private/apr_dbd_odbc_v2.h
Date Fri, 13 Jun 2008 07:15:54 GMT
tdonovan@apache.org wrote:
> Author: tdonovan
> Date: Thu Jun 12 10:54:15 2008
> New Revision: 667182
> 
> URL: http://svn.apache.org/viewvc?rev=667182&view=rev
> Log:
> apr_dbd_odbc driver

Tom - please try not to bury bug fixes in an unrelated patch.

But this is a great fix (below) - care to backport to branches/1.3.x ?

Bill

> --- apr/apr-util/trunk/dbd/apr_dbd.c (original)
> +++ apr/apr-util/trunk/dbd/apr_dbd.c Thu Jun 12 10:54:15 2008
> @@ -97,10 +97,10 @@
>      /* Top level pool scope, need process-scope lifetime */
>      for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
>           pool = parent;
> -
> +#if APU_DSO_BUILD
>      /* deprecate in 2.0 - permit implicit initialization */
>      apu_dso_init(pool);
> -
> +#endif
>      drivers = apr_hash_make(pool);
>  
>  #if APR_HAS_THREADS
> @@ -146,14 +146,17 @@
>  #endif
>      apr_status_t rv;
>  
> +#if APU_DSO_BUILD
>      rv = apu_dso_mutex_lock();
>      if (rv) {
>          return rv;
>      }
> -
> +#endif
>      *driver = apr_hash_get(drivers, name, APR_HASH_KEY_STRING);
>      if (*driver) {
> +#if APU_DSO_BUILD
>          apu_dso_mutex_unlock();
> +#endif
>          return APR_SUCCESS;
>      }
>  


Mime
View raw message