Commit 38dba79c authored by Joe Orton's avatar Joe Orton
Browse files

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
parent 28a897db

ssl_engine_config.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

        }

ssl_private.h

+1 −2
Original line number Diff line number Diff line
@@ -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;



/*