diff --git a/changes-entries/pr69397.txt b/changes-entries/pr69397.txt deleted file mode 100644 index 32ae57e1f2a..00000000000 --- a/changes-entries/pr69397.txt +++ /dev/null @@ -1,2 +0,0 @@ - *) mod_ssl: Disallow use of "SSLOpenSSLConfCmd" in - context. PR 69397. [Joe Orton] diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 3bc2063da82..b28ec9df4b7 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -2935,7 +2935,8 @@ forward secrecy.

SSLOpenSSLConfCmd Configure OpenSSL parameters through its SSL_CONF API SSLOpenSSLConfCmd command-name command-value -server config +server config +virtual host Available in httpd 2.4.8 and later, if using OpenSSL 1.0.2 or later diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index a9e98b9c5bf..43593d799c7 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -2162,10 +2162,6 @@ const char *ssl_cmd_SSLOpenSSLConfCmd(cmd_parms *cmd, void *dcfg, const char *err; ssl_ctx_param_t *param; - if ((err = ap_check_cmd_context(cmd, GLOBAL_ONLY))) { - return err; - } - if (value_type == SSL_CONF_TYPE_UNKNOWN) { return apr_psprintf(cmd->pool, "'%s': invalid OpenSSL configuration command",