From: Rainer Jung <rjung@apache.org>
Date: Tue, 11 Dec 2012 10:24:18 +0000 (+0000)
Subject: mod_session_crypto: Protect ourselves against underlying libraries who
X-Git-Tag: 2.4.4~338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6b4df2d731477db1fc373c3a149b8b9db54b32b;p=apache

mod_session_crypto: Protect ourselves against underlying libraries who
fail to load without providing an error message of their own.

Submitted by: minfrin
Backported by: minfrin
Reviewed by: minfrin, sf, rjung

Backport of r1418655 from turnk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1420072 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index d4249a2c86..5a48720222 100644
--- a/STATUS
+++ b/STATUS
@@ -109,12 +109,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1 gsmith, rjung: provided you also include this fix for Windows
                 http://svn.apache.org/viewvc?view=revision&revision=1419084
 
-   * mod_session_crypto: Protect ourselves against underlying libraries who
-     fail to load without providing an error message of their own.
-     trunk patch: http://svn.apache.org/viewvc?rev=1418655&view=rev
-     2.4.x patch: trunk patch works
-     +1: minfrin, sf, rjung
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/session/mod_session_crypto.c b/modules/session/mod_session_crypto.c
index f9e831da85..f48ff0385b 100644
--- a/modules/session/mod_session_crypto.c
+++ b/modules/session/mod_session_crypto.c
@@ -435,7 +435,7 @@ static int session_crypto_init(apr_pool_t *p, apr_pool_t *plog,
         }
         if (APR_SUCCESS != rv && err) {
             ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(01845)
-                    "%s", err->msg);
+                    "The crypto library '%s' could not be loaded: %s (%s: %d)", conf->library, err->msg, err->reason, err->rc);
             return rv;
         }
         if (APR_ENOTIMPL == rv) {