You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2012/04/02 14:49:54 UTC
svn commit: r1308326 - in /apr/apr-util/branches/1.5.x: ./ CHANGES
crypto/apr_crypto.c
Author: minfrin
Date: Mon Apr 2 12:49:54 2012
New Revision: 1308326
URL: http://svn.apache.org/viewvc?rev=1308326&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.5.x/ (props changed)
apr/apr-util/branches/1.5.x/CHANGES
apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1308318
Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1308326&r1=1308325&r2=1308326&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Mon Apr 2 12:49:54 2012
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.5.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]
Changes with APR-util 1.4.0
Modified: apr/apr-util/branches/1.5.x/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/crypto/apr_crypto.c?rev=1308326&r1=1308325&r2=1308326&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/crypto/apr_crypto.c (original)
+++ apr/apr-util/branches/1.5.x/crypto/apr_crypto.c Mon Apr 2 12:49:54 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