From 99b2042f267486c996f61ebcccad452df83575bb Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 23 Aug 2001 02:46:23 +0000 Subject: [PATCH] register ssl_var_lookup() as an optional function git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90537 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.h | 6 ++++++ modules/ssl/ssl_engine_vars.c | 7 +------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index dab123b0a9..d40f330d71 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -107,6 +107,7 @@ #include "apr_fnmatch.h" #include "apr_strings.h" #include "apr_dbm.h" +#include "apr_optional.h" /* OpenSSL headers */ #include @@ -686,6 +687,11 @@ void ssl_var_register(void); char *ssl_var_lookup(apr_pool_t *, server_rec *, conn_rec *, request_rec *, char *); void ssl_var_log_config_register(apr_pool_t *p); +APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup, + (apr_pool_t *, server_rec *, + conn_rec *, request_rec *, + char *)); + /* Proxy Extensions */ #if 0 /* XXX */ void ssl_ext_proxy_register(apr_pool_t *p); diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c index 1f4ba7c929..00aa0a43b2 100644 --- a/modules/ssl/ssl_engine_vars.c +++ b/modules/ssl/ssl_engine_vars.c @@ -83,12 +83,7 @@ static char *ssl_var_lookup_ssl_version(apr_pool_t *p, char *var); void ssl_var_register(void) { -#if 0 /* XXX */ - ap_hook_configure("ap::mod_ssl::var_lookup", - AP_HOOK_SIG6(ptr,ptr,ptr,ptr,ptr,ptr), AP_HOOK_DECLINE(NULL)); - ap_hook_register("ap::mod_ssl::var_lookup", - ssl_var_lookup, AP_HOOK_NOCTX); -#endif /* XXX */ + APR_REGISTER_OPTIONAL_FN(ssl_var_lookup); return; } -- 2.50.1