From ce895a193200ddbccf35667f6de451963546a195 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Wed, 27 Mar 2002 19:38:05 +0000 Subject: [PATCH] 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 --- modules/ssl/mod_ssl.h | 2 ++ modules/ssl/ssl_engine_pphrase.c | 2 +- modules/ssl/ssl_engine_vars.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index 14a0d9ab56..04908d23a9 100644 --- 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 #include diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index f820a884e5..a1c91250aa 100644 --- 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 c1a4127908..1671ec116c 100644 --- 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); -- 2.50.1