From: Doug MacEachern <dougm@apache.org>
Date: Thu, 23 Aug 2001 02:46:23 +0000 (+0000)
Subject: register ssl_var_lookup() as an optional function
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dbf223921911dd62a3c1ce9d23be3292b15f7ea;p=thirdparty%2Fapache%2Fhttpd.git

register ssl_var_lookup() as an optional function


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@90537 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/mod_ssl.h b/mod_ssl.h
index dab123b0a93..d40f330d71c 100644
--- a/mod_ssl.h
+++ b/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 <ssl.h>
@@ -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/ssl_engine_vars.c b/ssl_engine_vars.c
index 1f4ba7c9295..00aa0a43b2d 100644
--- a/ssl_engine_vars.c
+++ b/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;
 }