Commit 8b136792 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

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
parent ae6f23fb

modules/ssl/mod_ssl.h

+6 −0
Original line number Diff line number Diff line
@@ -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);

modules/ssl/ssl_engine_vars.c

+1 −6
Original line number Diff line number Diff line
@@ -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;

}