diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2013-03-07 17:27:55 +0000 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2013-03-07 17:27:55 +0000 |
| commit | 723bba5dffb2b737ec4dccfd124c7613cf19801f (patch) | |
| tree | b0b6f5fafb838f51cc5c6e2ad0a77bdaf5dc876b | |
| parent | 16d02bd9d9d11a648b324eab27e91475fcdaf26b (diff) | |
| download | httpd-723bba5dffb2b737ec4dccfd124c7613cf19801f.tar.gz | |
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
| -rw-r--r-- | Apache-apr2.dsw | 4 | ||||
| -rw-r--r-- | Apache.dsw | 4 | ||||
| -rw-r--r-- | Makefile.win | 4 | ||||
| -rw-r--r-- | build/installwinconf.awk | 2 | ||||
| -rw-r--r-- | os/win32/BaseAddr.ref | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 061d63397d..8539627819 100644 --- 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 81778182b6..920adde4ae 100644 --- 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 d619ac95ef..2a68ba50bc 100644 --- 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 b4b5714e5e..6bd9bb864f 100644 --- 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 1f7012a06e..c99f3c6c0a 100644 --- 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 |