diff options
| author | Jean-Frederic Clere <jfclere@apache.org> | 2018-10-17 14:48:18 +0200 |
|---|---|---|
| committer | Jean-Frederic Clere <jfclere@apache.org> | 2018-10-17 14:48:18 +0200 |
| commit | 8280486c73a55c46b2e892a20e87cd9ed4b215d6 (patch) | |
| tree | 54dd9c75519d83a7972530b35e112f9e5f8b1517 /modules/ssl | |
| parent | * Correctly merge configurations that have client certificates set (diff) | |
| download | apache2-8280486c73a55c46b2e892a20e87cd9ed4b215d6.tar.xz apache2-8280486c73a55c46b2e892a20e87cd9ed4b215d6.zip | |
rollback 1844001.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1844090 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
| -rw-r--r-- | modules/ssl/mod_ssl.c | 2 | ||||
| -rw-r--r-- | modules/ssl/ssl_engine_kernel.c | 5 | ||||
| -rw-r--r-- | modules/ssl/ssl_private.h | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index ca6618b2f8..605d987c3d 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -776,8 +776,6 @@ static void ssl_register_hooks(apr_pool_t *p) AUTHZ_PROVIDER_VERSION, &ssl_authz_provider_verify_client, AP_AUTH_INTERNAL_PER_CONF); - ap_register_provider(p, "mod_ssl" , "ssl_variables", "0", - ssl_hook_GetVars()); } module AP_MODULE_DECLARE_DATA ssl_module = { diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index 2e543ae0f9..e91f600e87 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -2697,8 +2697,3 @@ int ssl_callback_SRPServerParams(SSL *ssl, int *ad, void *arg) } #endif /* HAVE_SRP */ - -const char * const *ssl_hook_GetVars() -{ - return ssl_hook_Fixup_vars; -} diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index fc51f8c894..8524c515ba 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -899,7 +899,6 @@ int ssl_hook_Fixup(request_rec *); int ssl_hook_ReadReq(request_rec *); int ssl_hook_Upgrade(request_rec *); void ssl_hook_ConfigTest(apr_pool_t *pconf, server_rec *s); -const char* const *ssl_hook_GetVars(void); /** Apache authz provisders */ extern const authz_provider ssl_authz_provider_require_ssl; |