apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1308328 - in /apr/apr-util/branches/1.4.x: ./ CHANGES crypto/apr_crypto.c
Date Mon, 02 Apr 2012 12:52:42 GMT
Author: minfrin
Date: Mon Apr  2 12:52:41 2012
New Revision: 1308328

URL: http://svn.apache.org/viewvc?rev=1308328&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.
Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1308318

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

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1308318

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=1308328&r1=1308327&r2=1308328&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Mon Apr  2 12:52:41 2012
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.4.3
 
+  *) 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 a statically
      compiled library is initialised for the first time. [Graham Leggett]
 

Modified: apr/apr-util/branches/1.4.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/crypto/apr_crypto.c?rev=1308328&r1=1308327&r2=1308328&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.4.x/crypto/apr_crypto.c Mon Apr  2 12:52:41 2012
@@ -217,17 +217,17 @@ APU_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