finish up mod_proxy_websocket/tunnel rename on Windows

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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 061d63397dbf0d4f72f15b0e6bddf5f2b9f19ab2..8539627819e8a9e972f92daeb00d85addbb4210f 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -291,7 +291,7 @@ Package=<4>
     Project_Dep_Name mod_proxy_scgi
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_proxy_websocket
+    Project_Dep_Name mod_proxy_tunnel
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_ratelimit
@@ -2378,7 +2378,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_proxy_websocket"=.\modules\proxy\mod_proxy_websocket.dsp - Package Owner=<4>
+Project: "mod_proxy_tunnel"=.\modules\proxy\mod_proxy_tunnel.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Apache.dsw b/Apache.dsw
index 81778182b6d03de89d48de28ba2c77967a31de47..920adde4aecf50e8a894c6dc529421c0a66a3c95 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -306,7 +306,7 @@ Package=<4>
     Project_Dep_Name mod_proxy_scgi
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name mod_proxy_websocket
+    Project_Dep_Name mod_proxy_tunnel
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name mod_ratelimit
@@ -2792,7 +2792,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mod_proxy_websocket"=.\modules\proxy\mod_proxy_websocket.dsp - Package Owner=<4>
+Project: "mod_proxy_tunnel"=.\modules\proxy\mod_proxy_tunnel.dsp - Package Owner=<4>
 
 Package=<5>
 {{{

diff --git a/Makefile.win b/Makefile.win
index d619ac95efa84b1771b910e983ffacda393b7cee..2a68ba50bcca5c9a7f88738fd24fe1575892ec04 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -557,7 +557,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f mod_proxy_ftp.mak   CFG="mod_proxy_ftp - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_proxy_http.mak  CFG="mod_proxy_http - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f mod_proxy_scgi.mak  CFG="mod_proxy_scgi - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f mod_proxy_websocket.mak  CFG="mod_proxy_websocket - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f mod_proxy_tunnel.mak  CFG="mod_proxy_tunnel - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !IF EXIST("srclib\serf")
         $(MAKE) $(MAKEOPT) -f mod_serf.mak        CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
@@ -833,7 +833,7 @@ _copybin:
        copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so)      "$(inst_so)" <.y
        copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so)     "$(inst_so)" <.y
        copy modules\proxy\$(LONG)\mod_proxy_scgi.$(src_so)     "$(inst_so)" <.y
-       copy modules\proxy\$(LONG)\mod_proxy_websocket.$(src_so)        "$(inst_so)" <.y
+       copy modules\proxy\$(LONG)\mod_proxy_tunnel.$(src_so)   "$(inst_so)" <.y
 !IF EXIST("srclib\serf")
        copy modules\proxy\$(LONG)\mod_serf.$(src_so)           "$(inst_so)" <.y
 !ENDIF

diff --git a/build/installwinconf.awk b/build/installwinconf.awk
index b4b5714e5ee9982775ab944f75320dabb6dec5b3..6bd9bb864fd24b3cbd4292241b36eda9c1b0f4ce 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -169,7 +169,7 @@ BEGIN {
           print "#LoadModule proxy_html_module modules/mod_proxy_html.so" > dstfl;
           print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl;
           print "#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so" > dstfl;
-          print "#LoadModule proxy_websocket_module modules/mod_proxy_websocket.so" > dstfl;
+          print "#LoadModule proxy_tunnel_module modules/mod_proxy_tunnel.so" > dstfl;
           print "#LoadModule ratelimit_module modules/mod_ratelimit.so" > dstfl;
           print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl;
           print "#LoadModule remoteip_module modules/mod_remoteip.so" > dstfl;

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index 1f7012a06e9986f0baf353521e3781cedf47f0df..c99f3c6c0a4b410c08a46eeee557850c27c4c407 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -122,4 +122,4 @@ mod_allowmethods.so         0x6F6F0000    0x00010000
 mod_cache_socache.so        0x6F6E0000    0x00010000
 mod_allowhandlers.so        0x6F6D0000    0x00010000
 mod_macro.so                0x6F6C0000    0x00010000
-mod_proxy_websocket.so      0x6F6B0000    0x00010000
+mod_proxy_tunnel.so         0x6F6B0000    0x00010000