bringing back MOD_SSL_VERSION macro, define it to AP_SERVER_BASEVERSION

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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 14a0d9ab560b53d5da168e87d6cb9aeac3b34b39..04908d23a9e64258d2a3e8afbd3c5ad0d7a08700 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -112,6 +112,8 @@
 #include "apr_shm.h"
 #include "apr_optional.h"
 
+#define MOD_SSL_VERSION AP_SERVER_BASEVERSION
+
 /* OpenSSL headers */
 #include <ssl.h>
 #include <err.h>

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index f820a884e5c275ba7c3f90fab172452dca4828e3..a1c91250aaa26a0b54f67965edf65ed819a4e153 100644 (file)
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -718,7 +718,7 @@ int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify, void *srv)
          */
         if (*pnPassPhraseDialog == 1) {
             apr_file_printf(writetty, "%s mod_ssl/%s (Pass Phrase Dialog)\n",
-                            AP_SERVER_BASEVERSION, AP_SERVER_BASEREVISION);
+                            AP_SERVER_BASEVERSION, MOD_SSL_VERSION);
             apr_file_printf(writetty, "Some of your private key files are encrypted for security reasons.\n");
             apr_file_printf(writetty, "In order to read them you have to provide us with the pass phrases.\n");
         }

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index c1a41279080830c088b3f0ca30393ee3ac932f02..1671ec116c4700b71e9293256a21d1a4a5e175de 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -601,7 +601,7 @@ static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var)
 #endif
     }
     else if (strEQ(var, "INTERFACE")) {
-        result = apr_psprintf(p, "mod_ssl/%s", AP_SERVER_BASEREVISION);
+        result = apr_psprintf(p, "mod_ssl/%s", MOD_SSL_VERSION);
     }
     else if (strEQ(var, "LIBRARY")) {
         result = apr_pstrdup(p, SSL_LIBRARY_TEXT);