From 3400f03621b5be404a33c0d3eb02303474b57377 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Fri, 22 Mar 2002 00:59:23 +0000 Subject: [PATCH] the mod_ssl provided with Apache >= 2.0 no longer has an independent version number git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94111 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 +------ modules/ssl/mod_ssl.h | 2 -- modules/ssl/ssl_engine_pphrase.c | 2 +- modules/ssl/ssl_engine_vars.c | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/STATUS b/STATUS index e0fdf97177..84757d9bbf 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2002/03/21 20:38:02 $] +Last modified at [$Date: 2002/03/22 00:59:23 $] Release: @@ -92,11 +92,6 @@ FINAL RELEASE SHOWSTOPPERS: * Address popular PRs * Win32 doesn't install as service correctly [9863, 9914, 9961] - * Don't forget to reversion mod_ssl, which is currently listed - as mod_ssl/3.0a0. - Jeff posted a patch 20020321. He'll commit if he doesn't see - any concerns expressed. - CURRENT VOTES: * Should we always build binaries statically unless otherwise diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index 89c0a58223..7b7ed2887e 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -64,8 +64,6 @@ #ifndef __MOD_SSL_H__ #define __MOD_SSL_H__ -#define MOD_SSL_VERSION "3.0a0" - /* * Optionally enable the experimental stuff, but allow the user to * override the decision which experimental parts are included by using diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index 8d6706545b..5982133e76 100644 --- a/modules/ssl/ssl_engine_pphrase.c +++ b/modules/ssl/ssl_engine_pphrase.c @@ -703,7 +703,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, MOD_SSL_VERSION); + AP_SERVER_BASEVERSION, AP_SERVER_BASEREVISION); 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 1671ec116c..c1a4127908 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", MOD_SSL_VERSION); + result = apr_psprintf(p, "mod_ssl/%s", AP_SERVER_BASEREVISION); } else if (strEQ(var, "LIBRARY")) { result = apr_pstrdup(p, SSL_LIBRARY_TEXT); -- 2.50.1