Skip to content

Commit 8a7132c

Browse files
notrojnotroj
committed
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
1 parent 73017cb commit 8a7132c

29 files changed

Lines changed: 672 additions & 652 deletions

‎Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ install-include:
179179
@cp -p $(srcdir)/modules/loggers/mod_log_config.h $(DESTDIR)$(includedir)
180180
@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
181181
@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
182-
@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
182+
@cp -p $(srcdir)/modules/ssl/mod_ssl.h $(DESTDIR)$(includedir)
183183
@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
184184
@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
185185
@chmod 644 $(DESTDIR)$(includedir)/*.h

‎modules/proxy/mod_proxy.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "mod_core.h"
2020

2121
#include "apr_optional.h"
22+
#include "mod_ssl.h"
2223

2324
#ifndef MAX
2425
#define MAX(x,y) ((x) >= (y) ? (x) : (y))
@@ -1027,9 +1028,6 @@ static const command_rec proxy_cmds[] =
10271028
{NULL}
10281029
};
10291030

1030-
APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
1031-
APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
1032-
10331031
static APR_OPTIONAL_FN_TYPE(ssl_proxy_enable) *proxy_ssl_enable = NULL;
10341032
static APR_OPTIONAL_FN_TYPE(ssl_engine_disable) *proxy_ssl_disable = NULL;
10351033

‎modules/ssl/config.m4‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,11 @@ dnl # hook module into the Autoconf mechanism (--enable-ssl option)
115115
APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [
116116
APACHE_CHECK_SSL_TOOLKIT
117117
CHECK_DISTCACHE
118-
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
119118
])
120119

120+
# Ensure that other modules can pick up mod_ssl.h
121+
APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
122+
121123
dnl # end of module specific part
122124
APACHE_MODPATH_FINISH
123125

‎modules/ssl/mod_ssl.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* Apache API interface structures
2424
*/
2525

26+
#include "ssl_private.h"
2627
#include "mod_ssl.h"
2728
#include "util_md5.h"
2829
#include <assert.h>

‎modules/ssl/mod_ssl.dsp‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)