svn commit: r1893468 - in /apr/apr-util/branches/1.6.x: ./ crypto/apr_crypto.c

[yl...@apache.org]

Author: ylavic
Date: Mon Sep 20 09:28:56 2021
New Revision: 1893468

URL: http://svn.apache.org/viewvc?rev=1893468&view=rev
Log:
Merge r1893466 from trunk:

apr_crypto: non-DSO drivers should have global lifetime too.

Same lifetime as the hashtable used by apr_crypto_get_driver() to cache the
drivers for reloads.

Submitted by: ylavic

Modified:
    apr/apr-util/branches/1.6.x/   (props changed)
    apr/apr-util/branches/1.6.x/crypto/apr_crypto.c

Propchange: apr/apr-util/branches/1.6.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1893466

Modified: apr/apr-util/branches/1.6.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/crypto/apr_crypto.c?rev=1893468&r1=1893467&r2=1893468&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.6.x/crypto/apr_crypto.c Mon Sep 20 09:28:56 2021
@@ -218,11 +218,11 @@ APU_DECLARE(apr_status_t) apr_crypto_get
         return APR_SUCCESS;
     }
 
-#if APU_DSO_BUILD
-    /* The driver DSO must have exactly the same lifetime as the
+    /* The driver must have exactly the same lifetime as the
      * drivers hash table; ignore the passed-in pool */
     pool = apr_hash_pool_get(drivers);
 
+#if APU_DSO_BUILD
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "crypto%s.nlm", name);
 #elif defined(WIN32) || defined(__CYGWIN__)