Add mod_proxy_websocket to Windows

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

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index 8c41cec044445d7eb89640b34c3e47a3379a0de0..061d63397dbf0d4f72f15b0e6bddf5f2b9f19ab2 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -291,6 +291,9 @@ Package=<4>
     Project_Dep_Name mod_proxy_scgi
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy_websocket
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_ratelimit
     End Project Dependency
     Begin Project Dependency
@@ -2373,6 +2376,26 @@ Package=<4>
     End Project Dependency
 }}}
 
+###############################################################################
+
+Project: "mod_proxy_websocket"=.\modules\proxy\mod_proxy_websocket.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
 
 ###############################################################################
 

diff --git a/Apache.dsw b/Apache.dsw
index 52cc61eada41460f9dc1a5b1ff922088c1d8e678..81778182b6d03de89d48de28ba2c77967a31de47 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -306,6 +306,9 @@ Package=<4>
     Project_Dep_Name mod_proxy_scgi
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_proxy_websocket
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_ratelimit
     End Project Dependency
     Begin Project Dependency
@@ -2789,6 +2792,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_proxy_websocket"=.\modules\proxy\mod_proxy_websocket.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libapr
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libaprutil
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name libhttpd
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name mod_proxy
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "mod_ratelimit"=.\modules\filters\mod_ratelimit.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Makefile.win b/Makefile.win
index f52f90587b1c0cd2167d0fa5f729720012a58519..d619ac95efa84b1771b910e983ffacda393b7cee 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -557,6 +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)
 !IF EXIST("srclib\serf")
         $(MAKE) $(MAKEOPT) -f mod_serf.mak        CFG="mod_serf - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 !ENDIF
@@ -832,6 +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
 !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 456f70de87e5f9d2bf6d1fba2496148ec682c3c6..b4b5714e5ee9982775ab944f75320dabb6dec5b3 100644 (file)
--- a/build/installwinconf.awk
+++ b/build/installwinconf.awk
@@ -169,6 +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 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_websocket.dsp b/modules/proxy/mod_proxy_websocket.dsp
new file mode 100644 (file)
index 0000000..4774cef
--- /dev/null
+++ b/modules/proxy/mod_proxy_websocket.dsp
@@ -0,0 +1,123 @@
+# Microsoft Developer Studio Project File - Name="mod_proxy_websocket" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
+\r
+CFG=mod_proxy_websocket - Win32 Release\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "mod_proxy_websocket.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "mod_proxy_websocket.mak" CFG="mod_proxy_websocket - Win32 Release"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "mod_proxy_websocket - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "mod_proxy_websocket - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "mod_proxy_websocket - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c\r
+# 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_websocket_src" /FD /c\r
+# ADD BASE MTL /nologo /D "NDEBUG" /win32\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x809 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /fo"Release/mod_proxy_websocket.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_websocket.so" /d LONG_NAME="proxy_websocket_module for Apache"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so\r
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so /opt:ref\r
+# Begin Special Build Tool\r
+TargetPath=.\Release\mod_proxy_websocket.so\r
+SOURCE="$(InputPath)"\r
+PostBuild_Desc=Embed .manifest\r
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2\r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "mod_proxy_websocket - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug"\r
+# PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c\r
+# 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_websocket_src" /FD /c\r
+# ADD BASE MTL /nologo /D "_DEBUG" /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0x809 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /fo"Debug/mod_proxy_websocket.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_websocket.so" /d LONG_NAME="proxy_websocket_module for Apache"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so\r
+# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so\r
+# Begin Special Build Tool\r
+TargetPath=.\Debug\mod_proxy_websocket.so\r
+SOURCE="$(InputPath)"\r
+PostBuild_Desc=Embed .manifest\r
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2\r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "mod_proxy_websocket - Win32 Release"\r
+# Name "mod_proxy_websocket - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"\r
+# Begin Source File\r
+\r
+SOURCE=.\mod_proxy_websocket.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter ".h"\r
+# Begin Source File\r
+\r
+SOURCE=.\mod_proxy.h\r
+# End Source File\r
+# End Group\r
+# Begin Source File\r
+\r
+SOURCE=..\..\build\win32\httpd.rc\r
+# End Source File\r
+# End Target\r
+# End Project\r

diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
index b2a4af134f4b819bc383209a6087c368403b0967..1f7012a06e9986f0baf353521e3781cedf47f0df 100644 (file)
--- a/os/win32/BaseAddr.ref
+++ b/os/win32/BaseAddr.ref
@@ -122,3 +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