You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@apache.org on 2013/03/07 18:27:55 UTC
svn commit: r1453974 - in /httpd/httpd/trunk: Apache-apr2.dsw Apache.dsw
Makefile.win build/installwinconf.awk os/win32/BaseAddr.ref
Author: gsmith
Date: Thu Mar 7 17:27:55 2013
New Revision: 1453974
URL: http://svn.apache.org/r1453974
Log:
finish up mod_proxy_websocket/tunnel rename on Windows
Modified:
httpd/httpd/trunk/Apache-apr2.dsw
httpd/httpd/trunk/Apache.dsw
httpd/httpd/trunk/Makefile.win
httpd/httpd/trunk/build/installwinconf.awk
httpd/httpd/trunk/os/win32/BaseAddr.ref
Modified: httpd/httpd/trunk/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache-apr2.dsw?rev=1453974&r1=1453973&r2=1453974&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache-apr2.dsw (original)
+++ httpd/httpd/trunk/Apache-apr2.dsw Thu Mar 7 17:27:55 2013
@@ -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>
{{{
Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1453974&r1=1453973&r2=1453974&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Thu Mar 7 17:27:55 2013
@@ -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>
{{{
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=1453974&r1=1453973&r2=1453974&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Mar 7 17:27:55 2013
@@ -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
Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=1453974&r1=1453973&r2=1453974&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Thu Mar 7 17:27:55 2013
@@ -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;
Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=1453974&r1=1453973&r2=1453974&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Thu Mar 7 17:27:55 2013
@@ -122,4 +122,4 @@ mod_allowmethods.so 0x6F6F0000
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