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

diff --git a/CHANGES b/CHANGES
index ed8da50b616fe89e18bd1bdf64701d4a375dea3c..c2c7dca6563bfd362d9788a2e0b5c3197182320f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_ssl: Drop support for the CompatEnvVars argument to
+     SSLOptions, which was never actually implemented in 2.0.
+     [Joe Orton]
+
   *) Fix bug in mod_deflate that unconditionally sent deflate'd output
      even when Accept-Encoding is not present.  [Justin Erenkrantz]
 

diff --git a/docs/conf/ssl-std.conf.in b/docs/conf/ssl-std.conf.in
index 4812e54197d57cc756141dfb2a25f6393f77bdec..4c6629932c8e04b7eea605cf71afa2c9279998ad 100644 (file)
--- a/docs/conf/ssl-std.conf.in
+++ b/docs/conf/ssl-std.conf.in
@@ -188,10 +188,6 @@ SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key
 #     because the extraction step is an expensive operation and is usually
 #     useless for serving static content. So one usually enables the
 #     exportation for CGI and SSI requests only.
-#   o CompatEnvVars:
-#     This exports obsolete environment variables for backward compatibility
-#     to Apache-SSL 1.x, mod_ssl 2.0.x, Sioux 1.0 and Stronghold 2.x. Use this
-#     to provide compatibility to existing CGI scripts.
 #   o StrictRequire:
 #     This denies access when "SSLRequireSSL" or "SSLRequire" applied even
 #     under a "Satisfy any" situation, i.e. when it applies access is denied
@@ -199,7 +195,7 @@ SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key
 #   o OptRenegotiate:
 #     This enables optimized SSL connection renegotiation handling when SSL
 #     directives are used in per-directory context. 
-#SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire
+#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
 <Files ~ "\.(cgi|shtml|phtml|php3?)$">
     SSLOptions +StdEnvVars
 </Files>

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 0eb1b1f3f52c0ad57338d879ff3646528f3b7e1c..42128b2d901a5328cd987665e3e3f07b458122f9 100644 (file)
--- 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 f8e9d1d8e5bd6d237907c232b7fa01516ab7a5b6..246c8c42141e7842373b2c00d470d43ff842e26f 100644 (file)
--- 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;
 
 /*