From: Joe Orton Date: Thu, 3 Jun 2004 09:28:12 +0000 (+0000) Subject: Drop support for the "CompatEnvVars" argument to SSLOptions, which was X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0433fae13d4179deec75e6b814198212d34cec82;p=thirdparty%2Fapache%2Fhttpd.git Drop support for the "CompatEnvVars" argument to SSLOptions, which was never implemented in 2.0 and never needed to be. * docs/ssl/ssl-std.conf.in: Remove CompatEnvVars examples. * modules/ssl/ssl_engine_config.c (ssl_cmd_SSLOptions): Don't allow the CompatEnvVars argument. * modules/ssl/ssl_private.h: Remove SSL_OPT_COMPATENVVARS macro. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@103829 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/ssl_engine_config.c b/ssl_engine_config.c index 0eb1b1f3f52..42128b2d901 100644 --- a/ssl_engine_config.c +++ b/ssl_engine_config.c @@ -1074,9 +1074,6 @@ const char *ssl_cmd_SSLOptions(cmd_parms *cmd, if (strcEQ(w, "StdEnvVars")) { opt = SSL_OPT_STDENVVARS; } - else if (strcEQ(w, "CompatEnvVars")) { - opt = SSL_OPT_COMPATENVVARS; - } else if (strcEQ(w, "ExportCertData")) { opt = SSL_OPT_EXPORTCERTDATA; } diff --git a/ssl_private.h b/ssl_private.h index f8e9d1d8e5b..246c8c42141 100644 --- a/ssl_private.h +++ b/ssl_private.h @@ -189,12 +189,11 @@ typedef int ssl_algo_t; #define SSL_OPT_NONE (0) #define SSL_OPT_RELSET (1<<0) #define SSL_OPT_STDENVVARS (1<<1) -#define SSL_OPT_COMPATENVVARS (1<<2) #define SSL_OPT_EXPORTCERTDATA (1<<3) #define SSL_OPT_FAKEBASICAUTH (1<<4) #define SSL_OPT_STRICTREQUIRE (1<<5) #define SSL_OPT_OPTRENEGOTIATE (1<<6) -#define SSL_OPT_ALL (SSL_OPT_STDENVVARS|SSL_OPT_COMPATENVVAR|SSL_OPT_EXPORTCERTDATA|SSL_OPT_FAKEBASICAUTH|SSL_OPT_STRICTREQUIRE|SSL_OPT_OPTRENEGOTIATE) +#define SSL_OPT_ALL (SSL_OPT_STDENVVARS|SSL_OPT_EXPORTCERTDATA|SSL_OPT_FAKEBASICAUTH|SSL_OPT_STRICTREQUIRE|SSL_OPT_OPTRENEGOTIATE) typedef int ssl_opt_t; /*