diff options
| author | Joe Orton <jorton@apache.org> | 2004-06-03 09:28:12 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-06-03 09:28:12 +0000 |
| commit | 4ea42b6e3bf8c6ac37feb70a1f7b2157b01862df (patch) | |
| tree | 03c1ed1f9a2cac32dcdfb978d243441dd5a00b22 /modules/ssl | |
| parent | 426c9670c6600dd2425b7d02b93fa04286d7c1e9 (diff) | |
| download | httpd-4ea42b6e3bf8c6ac37feb70a1f7b2157b01862df.tar.gz | |
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@103829 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
| -rw-r--r-- | modules/ssl/ssl_engine_config.c | 3 | ||||
| -rw-r--r-- | modules/ssl/ssl_private.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index 0eb1b1f3f5..42128b2d90 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/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/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index f8e9d1d8e5..246c8c4214 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/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; /* |