From 3ca3524c318f56ce0b8bc62e2400d943de13bed0 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sat, 28 Feb 2004 18:06:35 +0000 Subject: Move mod_ssl-internal interfaces into ssl_private.h; allow mod_ssl.h to be included even when mod_ssl is not enabled. * Makefile.in (install-include): Only install mod_ssl.h. * modules/ssl/ssl_private.h: New file. * modules/ssl/mod_ssl.h: Move everything apart from than the optional hook definitions into ssl_private.h. * modules/ssl/*.c: Include ssl_private.h not mod_ssl.h * modules/ssl/config.m4: Always add the mod_ssl directory to the include path so other modules can find mod_ssl.h. * modules/proxy/mod_proxy.c: Include mod_ssl.h to pick up the optional hook definitions rather than copy'n'pasting them. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102803 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'modules/proxy') diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 78a0e12ce4..2bb4b41cac 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -19,6 +19,7 @@ #include "mod_core.h" #include "apr_optional.h" +#include "mod_ssl.h" #ifndef MAX #define MAX(x,y) ((x) >= (y) ? (x) : (y)) @@ -1027,9 +1028,6 @@ static const command_rec proxy_cmds[] = {NULL} }; -APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *)); -APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *)); - static APR_OPTIONAL_FN_TYPE(ssl_proxy_enable) *proxy_ssl_enable = NULL; static APR_OPTIONAL_FN_TYPE(ssl_engine_disable) *proxy_ssl_disable = NULL; -- cgit v1.2.3