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

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

PR: 23956
Submitted by: Eric Seidel <seidel@apple.com>
Reviewed by: Andr�� Malo, Jeff Trawick, Joe Orton

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

diff --git a/CHANGES b/CHANGES
index 1e688b8e34cce684173d08bf78506478aa505088..949214dcf96fcab2fda4d2072260690c0575afa3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) mod_ssl: Advertise SSL library version as determined at run-time rather
+     than at compile-time.  PR 23956.  [Eric Seidel <seidel apple.com>]
+
   *) mod_ssl: Fix segfault on a non-SSL request if the the 'c' log
      format code is used.  PR 22741.  [Gary E. Miller <gem rellim.com>]
 

diff --git a/STATUS b/STATUS
index 1a33be4508180093ccc4d41cbedda6a8712d234c..f49b746a6d905bcb6aaeec1ab68d5a7d9ec270c6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/01/12 14:44:46 $]
+Last modified at [$Date: 2004/01/12 14:59:16 $]
 
 Release:
 
@@ -100,11 +100,6 @@ PATCHES TO BACKPORT FROM 2.1
       server/core.c r1.255, r1.256
       +1: bnicholes, nd
 
-    * mod_ssl: Determine library version string at run-time rather than compile-time.
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_engine_vars.c?r1=1.25&r2=1.26
-      PR: 23956
-      +1: jorton, nd, trawick
-
     * mod_dav: Reject requests including fragment part in the Request-URI.
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/dav/main/mod_dav.c?r1=1.102&r2=1.103
       PR: 21779

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index a3e243db7465d63863bf6d962e54fed36c23fab7..53a519d3c540e4163ccff8f1a1cf0ad1a1372daa 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -609,7 +609,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)