You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/03/22 01:59:24 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_pphrase.c ssl_engine_vars.c
trawick 02/03/21 16:59:23
Modified: . STATUS
modules/ssl mod_ssl.h ssl_engine_pphrase.c ssl_engine_vars.c
Log:
the mod_ssl provided with Apache >= 2.0 no longer has an independent
version number
Revision Changes Path
1.554 +1 -6 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- STATUS 21 Mar 2002 20:38:02 -0000 1.553
+++ STATUS 22 Mar 2002 00:59:23 -0000 1.554
@@ -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:
@@ -91,11 +91,6 @@
* 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:
1.82 +0 -2 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- mod_ssl.h 17 Mar 2002 17:32:24 -0000 1.81
+++ mod_ssl.h 22 Mar 2002 00:59:23 -0000 1.82
@@ -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
1.29 +1 -1 httpd-2.0/modules/ssl/ssl_engine_pphrase.c
Index: ssl_engine_pphrase.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ssl_engine_pphrase.c 17 Mar 2002 17:32:24 -0000 1.28
+++ ssl_engine_pphrase.c 22 Mar 2002 00:59:23 -0000 1.29
@@ -703,7 +703,7 @@
*/
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");
}
1.17 +1 -1 httpd-2.0/modules/ssl/ssl_engine_vars.c
Index: ssl_engine_vars.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_vars.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ssl_engine_vars.c 13 Mar 2002 20:47:55 -0000 1.16
+++ ssl_engine_vars.c 22 Mar 2002 00:59:23 -0000 1.17
@@ -601,7 +601,7 @@
#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);