Fixed proxy exports list; renamed wstunnel module.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1458945 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile
index 489f271f85b3edfbf2e580ef04b04c4ac8cbc60c..d61a251ea1ea8a7a03681ac99306eda1b9ef159f 100644 (file)
--- a/modules/proxy/NWGNUmakefile
+++ b/modules/proxy/NWGNUmakefile
@@ -165,7 +165,7 @@ TARGET_nlm = \
        $(OBJDIR)/proxylbm_hb.nlm \
        $(OBJDIR)/proxylbm_req.nlm \
        $(OBJDIR)/proxylbm_traf.nlm \
-       $(OBJDIR)/proxywebskt.nlm \
+       $(OBJDIR)/proxywstunnel.nlm \
        $(EOLIST)
 
 # If WITH_SERF and SERFSRC have been defined then build the mod_serf module

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index b6b9e28167ec85404cd508bb24f151d17563674f..885a420babc789139ac37dda1676c1b97f800a20 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -282,6 +282,7 @@ $(OBJDIR)/mod_proxy.imp:
        @echo $(DL) ap_proxy_connect_to_backend,$(DL)>> $@
        @echo $(DL) ap_proxy_connection_create,$(DL)>> $@
        @echo $(DL) ap_proxy_cookie_reverse_map,$(DL)>> $@
+       @echo $(DL) ap_proxy_create_hdrbrgd,$(DL)>> $@
        @echo $(DL) ap_proxy_define_balancer,$(DL)>> $@
        @echo $(DL) ap_proxy_define_worker,$(DL)>> $@
        @echo $(DL) ap_proxy_determine_connection,$(DL)>> $@
@@ -299,6 +300,7 @@ $(OBJDIR)/mod_proxy.imp:
        @echo $(DL) ap_proxy_is_word,$(DL)>> $@
        @echo $(DL) ap_proxy_location_reverse_map,$(DL)>> $@
        @echo $(DL) ap_proxy_parse_wstatus,$(DL)>> $@
+       @echo $(DL) ap_proxy_pass_brigade,$(DL)>> $@
        @echo $(DL) ap_proxy_post_request,$(DL)>> $@
        @echo $(DL) ap_proxy_pre_http_request,$(DL)>> $@
        @echo $(DL) ap_proxy_pre_request,$(DL)>> $@

diff --git a/modules/proxy/NWGNUproxywebskt b/modules/proxy/NWGNUproxywstunnel
similarity index 97%
rename from modules/proxy/NWGNUproxywebskt
rename to modules/proxy/NWGNUproxywstunnel
index 4402ea3ad6605e82305f765269b4505f38ca37c0..ce84ce4566248993b29eb7b38c57520047c3ee1d 100644 (file)
--- a/modules/proxy/NWGNUproxywebskt
+++ b/modules/proxy/NWGNUproxywstunnel
@@ -93,13 +93,13 @@ endif
 # This is used by the link 'name' directive to name the nlm.  If left blank
 # TARGET_nlm (see below) will be used.
 #
-NLM_NAME       = proxywebskt
+NLM_NAME       = proxywstunnel
 
 #
 # This is used by the link '-desc ' directive.
 # If left blank, NLM_NAME will be used.
 #
-NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy Web Socket Module
+NLM_DESCRIPTION        = Apache $(VERSION_STR) Proxy Web Socket Tunnel Module
 
 #
 # This is used by the '-threadname' directive.  If left blank,