* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_version):

Determine the library version string at run-time rather than at
compile-time.

Submitted by: Eric Seidel <eseidel@apple.com>
PR: 23956

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101879 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 6c9c887b935e42337cf5852ce16bf247115504e1..bb45b58f28b3e244be5a5399e3486e2a5bb45609 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_ssl: SSL_VERSION_LIBRARY is set to the version string from the
+     SSL library used at run-time, rather than at compile-time.
+     PR: 23956  [Eric Seidel <eseidel apple.com>]
+
   *) SECURITY [CAN-2003-0020]: Escape arbitrary data before writing
      into the errorlog.  [André Malo]
 

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index fa4afca610ac134d979c2882ee0a3750a5802d13..6f3667866b01cb356c0449babdecbe7ca83270ab 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -608,7 +608,7 @@ static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
         result = apr_psprintf(p, "mod_ssl/%s", MOD_SSL_VERSION);
     }
     else if (strEQ(var, "LIBRARY")) {
-        result = apr_pstrdup(p, SSL_LIBRARY_TEXT);
+        result = apr_pstrdup(p, SSLeay_version(SSLEAY_VERSION));
         if ((cp = strchr(result, ' ')) != NULL) {
             *cp = '/';
             if ((cp2 = strchr(cp, ' ')) != NULL)