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

diff --git a/modules/http2/NWGNUproxyht2 b/modules/http2/NWGNUproxyht2
index 7153d084fcb371c9c7959fe17a4b6ac41e4004d6..d2c828bb8bea134e168305ef261764b1ce38729f 100644 (file)
--- 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 e94b3511219e00681eb794f1b373c7c1d7946c13..467984dfa8c299a70daee5bf2ce9f02b8c2458b5 100644 (file)
--- 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 a0eda6f1c698feb2c4d389037cdfc2a05d6d69d6..efce01edb650ceff74044f35b67035b2849bf311 100644 (file)
--- 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)