apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1308318 - in /apr/apr/trunk: CHANGES crypto/apr_crypto.c
Date Mon, 02 Apr 2012 12:29:58 GMT
Author: minfrin
Date: Mon Apr  2 12:29:57 2012
New Revision: 1308318

URL: http://svn.apache.org/viewvc?rev=1308318&view=rev
Log:
apr_crypto: Ensure that the if/else that governs the static
initialisation of each crypto driver works when the first driver
isn't in use.

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/crypto/apr_crypto.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1308318&r1=1308317&r2=1308318&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES [utf-8] (original)
+++ apr/apr/trunk/CHANGES [utf-8] Mon Apr  2 12:29:57 2012
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 2.0.0
 
+  *) apr_crypto: Ensure that the if/else that governs the static
+     initialisation of each crypto driver works when the first driver
+     isn't in use. [Graham Leggett]
+
   *) apr_crypto: Ensure the *driver variable is initialised when the library
      has already been loaded. Fix ported from apr_dbd. [Graham Leggett]
 

Modified: apr/apr/trunk/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=1308318&r1=1308317&r2=1308318&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto.c Mon Apr  2 12:29:57 2012
@@ -211,17 +211,17 @@ APR_DECLARE(apr_status_t) apr_crypto_get
     }
 #endif
 #if APU_HAVE_NSS
-    else if (name[0] == 'n' && !strcmp(name, "nss")) {
+    if (name[0] == 'n' && !strcmp(name, "nss")) {
         DRIVER_LOAD("nss", apr_crypto_nss_driver, pool, params, rv, result);
     }
 #endif
 #if APU_HAVE_MSCAPI
-    else if (name[0] == 'm' && !strcmp(name, "mscapi")) {
+    if (name[0] == 'm' && !strcmp(name, "mscapi")) {
         DRIVER_LOAD("mscapi", apr_crypto_mscapi_driver, pool, params, rv, result);
     }
 #endif
 #if APU_HAVE_MSCNG
-    else if (name[0] == 'm' && !strcmp(name, "mscng")) {
+    if (name[0] == 'm' && !strcmp(name, "mscng")) {
         DRIVER_LOAD("mscng", apr_crypto_mscng_driver, pool, params, rv, result);
     }
 #endif



Mime
View raw message