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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index dab123b0a9310b78caf7c17b5294feafcd25aa65..d40f330d71c9cc6e511691e67c73d5d677c4492a 100644 (file)
--- 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 <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/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 1f4ba7c9295b36d5da8053cca0857f376104eb8b..00aa0a43b2d126cc3a15914f623478653a6d6d44 100644 (file)
--- 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;
 }