diff options
| author | Joe Orton <jorton@apache.org> | 2004-02-28 19:06:35 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-02-28 19:06:35 +0100 |
| commit | 3ca3524c318f56ce0b8bc62e2400d943de13bed0 (patch) | |
| tree | f96ce30cc5b9916731eb1c798f69a6a8bf3795dc /modules/proxy | |
| parent | Use SSL_CLIENT_CERT_CHAIN_<n> with an underscore before the <n>. (diff) | |
| download | apache2-3ca3524c318f56ce0b8bc62e2400d943de13bed0.tar.xz apache2-3ca3524c318f56ce0b8bc62e2400d943de13bed0.zip | |
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
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/mod_proxy.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; |