From 0c7d2c0b1d658073c68c49358aa4bd59518da5c3 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Tue, 26 Apr 2016 22:31:19 +0000 Subject: [PATCH] Follow up to r1740928: updates for Netware build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1741112 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/NWGNUproxyht2 | 1 + modules/proxy/mod_proxy.h | 8 ++++---- modules/ssl/NWGNUmakefile | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/http2/NWGNUproxyht2 b/modules/http2/NWGNUproxyht2 index 7153d084fc..d2c828bb8b 100644 --- a/modules/http2/NWGNUproxyht2 +++ b/modules/http2/NWGNUproxyht2 @@ -231,6 +231,7 @@ FILES_nlm_Ximports = \ ap_proxy_canonenc \ ap_proxy_connect_backend \ ap_proxy_connection_create \ + ap_proxy_connection_create_ex \ ap_proxy_cookie_reverse_map \ ap_proxy_determine_connection \ ap_proxy_location_reverse_map \ diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index e94b351121..467984dfa8 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -587,10 +587,10 @@ APR_DECLARE_OPTIONAL_FN(const char *, set_worker_hc_param, (apr_pool_t *, server_rec *, proxy_worker *, const char *, const char *, void *)); -APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, section_post_config, - (apr_pool_t *p, apr_pool_t *plog, - apr_pool_t *ptemp, server_rec *s, - ap_conf_vector_t *section_config)) +PROXY_DECLARE_OPTIONAL_HOOK(proxy, PROXY, int, section_post_config, + (apr_pool_t *p, apr_pool_t *plog, + apr_pool_t *ptemp, server_rec *s, + ap_conf_vector_t *section_config)) APR_DECLARE_EXTERNAL_HOOK(proxy, PROXY, int, scheme_handler, (request_rec *r, proxy_worker *worker, diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index a0eda6f1c6..efce01edb6 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -55,6 +55,7 @@ XINCDIRS += \ $(SRC)/include \ $(STDMOD)/cache \ $(STDMOD)/generators \ + $(STDMOD)/proxy \ $(SERVER)/mpm/NetWare \ $(NWOS) \ $(EOLIST) -- 2.50.1