From e5d0f97ec8706ac92a598d61e43d6981c3434ec9 Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Sat, 9 Mar 2013 05:51:48 +0000 Subject: Final rename per r1454386, we hope Set eol style of mod_proxy_wstunnel.dsp to native for easy editing on any OS git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454659 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.win | 4 ++-- build/installwinconf.awk | 2 +- modules/proxy/mod_proxy_wstunnel.dsp | 42 ++++++++++++++++++------------------ os/win32/BaseAddr.ref | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Makefile.win b/Makefile.win index 2a68ba50bc..f191695107 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_tunnel.mak CFG="mod_proxy_tunnel - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_proxy_wstunnel.mak CFG="mod_proxy_wstunnel - 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_tunnel.$(src_so) "$(inst_so)" <.y + copy modules\proxy\$(LONG)\mod_proxy_wstunnel.$(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 6bd9bb864f..83a57ed149 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_tunnel_module modules/mod_proxy_tunnel.so" > dstfl; + print "#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.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/modules/proxy/mod_proxy_wstunnel.dsp b/modules/proxy/mod_proxy_wstunnel.dsp index b7c0b4453a..7123bd6586 100644 --- a/modules/proxy/mod_proxy_wstunnel.dsp +++ b/modules/proxy/mod_proxy_wstunnel.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="mod_proxy_tunnel" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="mod_proxy_wstunnel" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=mod_proxy_tunnel - Win32 Release +CFG=mod_proxy_wstunnel - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "mod_proxy_tunnel.mak". +!MESSAGE NMAKE /f "mod_proxy_wstunnel.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "mod_proxy_tunnel.mak" CFG="mod_proxy_tunnel - Win32 Release" +!MESSAGE NMAKE /f "mod_proxy_wstunnel.mak" CFG="mod_proxy_wstunnel - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_proxy_tunnel - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_proxy_tunnel - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy_wstunnel - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy_wstunnel - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "mod_proxy_tunnel - Win32 Release" +!IF "$(CFG)" == "mod_proxy_wstunnel - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -43,25 +43,25 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_tunnel_src" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_wstunnel_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x409 /fo"Release/mod_proxy_tunnel.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_tunnel.so" /d LONG_NAME="proxy_tunnel_module for Apache" +# ADD RSC /l 0x409 /fo"Release/mod_proxy_wstunnel.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_wstunnel.so" /d LONG_NAME="proxy_wstunnel_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so /opt:ref +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_wstunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_wstunnel.so +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_proxy_wstunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_wstunnel.so /opt:ref # Begin Special Build Tool -TargetPath=.\Release\mod_proxy_tunnel.so +TargetPath=.\Release\mod_proxy_wstunnel.so SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool -!ELSEIF "$(CFG)" == "mod_proxy_tunnel - Win32 Debug" +!ELSEIF "$(CFG)" == "mod_proxy_wstunnel - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -75,19 +75,19 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_tunnel_src" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_wstunnel_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x409 /fo"Debug/mod_proxy_tunnel.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_tunnel.so" /d LONG_NAME="proxy_tunnel_module for Apache" +# ADD RSC /l 0x409 /fo"Debug/mod_proxy_wstunnel.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_wstunnel.so" /d LONG_NAME="proxy_wstunnel_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_wstunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_wstunnel.so +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_wstunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_wstunnel.so # Begin Special Build Tool -TargetPath=.\Debug\mod_proxy_tunnel.so +TargetPath=.\Debug\mod_proxy_wstunnel.so SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 @@ -97,14 +97,14 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # Begin Target -# Name "mod_proxy_tunnel - Win32 Release" -# Name "mod_proxy_tunnel - Win32 Debug" +# Name "mod_proxy_wstunnel - Win32 Release" +# Name "mod_proxy_wstunnel - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File -SOURCE=.\mod_proxy_tunnel.c +SOURCE=.\mod_proxy_wstunnel.c # End Source File # End Group # Begin Group "Header Files" diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index c99f3c6c0a..6adb4038d6 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_tunnel.so 0x6F6B0000 0x00010000 +mod_proxy_wstunnel.so 0x6F6B0000 0x00010000 -- cgit v1.2.3