Commit 58136f66 authored by Mladen Turk's avatar Mladen Turk
Browse files

Added mod_proxy_fcgi win32 build. 

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

Apache.dsw

+28 −0
Changes for Apache.dsw: 28 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ Package=<4> 
    Begin Project Dependency

    Project_Dep_Name mod_proxy_balancer

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_proxy_fcgi

    End Project Dependency

}}}



###############################################################################
@@ -1775,6 +1778,31 @@ Package=<4> 
    End Project Dependency

}}}



###############################################################################



Project: "mod_proxy_fcgi"=.\modules\proxy\mod_proxy_fcgi.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_proxy_ftp"=.\modules\proxy\mod_proxy_ftp.dsp - Package Owner=<4>

CHANGES

+2 −0
Changes for CHANGES: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_proxy_fcgi: Added win32 build. [Mladen Turk]

















  *) mod_authnz_ldap: Add an AuthLDAPRemoteUserAttribute directive. If









     set, REMOTE_USER will be set to this attribute, rather than the









     username supplied by the user. Useful for example when you want users


































Makefile.win



+2
−0



























Changes for Makefile.win: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -308,6 +308,7 @@ _build:







	 $(MAKE) $(MAKEOPT) -f mod_proxy_ajp.mak   CFG="mod_proxy_ajp - Win32 $(LONG)" RECURSE=0 $(CTARGET)









	 $(MAKE) $(MAKEOPT) -f mod_proxy_balancer.mak  CFG="mod_proxy_balancer - Win32 $(LONG)" RECURSE=0 $(CTARGET)









	 $(MAKE) $(MAKEOPT) -f mod_proxy_connect.mak CFG="mod_proxy_connect - Win32 $(LONG)" RECURSE=0 $(CTARGET)









	 $(MAKE) $(MAKEOPT) -f mod_proxy_fcgi.mak  CFG="mod_proxy_fcgi - Win32 $(LONG)" RECURSE=0 $(CTARGET)









	 $(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)









	cd ..\..










@@ -456,6 +457,7 @@ _copybin:







	copy modules\proxy\$(LONG)\mod_proxy_ajp.$(src_so) 	"$(inst_so)" <.y









	copy modules\proxy\$(LONG)\mod_proxy_balancer.$(src_so) "$(inst_so)" <.y









	copy modules\proxy\$(LONG)\mod_proxy_connect.$(src_so) 	"$(inst_so)" <.y









	copy modules\proxy\$(LONG)\mod_proxy_fcgi.$(src_so) 	"$(inst_so)" <.y









	copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) 	"$(inst_so)" <.y









	copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) 	"$(inst_so)" <.y









!IF EXIST("srclib\openssl")


































modules/proxy/mod_proxy_fcgi.dsp
0 → 100644



+115
−0



























Changes for modules/proxy/mod_proxy_fcgi.dsp: 115 added lines, 0 removed lines.



Original line number
Diff line number
Diff line









# Microsoft Developer Studio Project File - Name="mod_proxy_fcgi" - 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_fcgi - 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_fcgi.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_fcgi.mak" CFG="mod_proxy_fcgi - Win32 Release"









!MESSAGE 









!MESSAGE Possible choices for configuration are:









!MESSAGE 









!MESSAGE "mod_proxy_fcgi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")









!MESSAGE "mod_proxy_fcgi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")









!MESSAGE 



















# Begin Project









# PROP AllowPerConfigDependencies 0









# PROP Scc_ProjName ""









# PROP Scc_LocalPath ""









CPP=cl.exe









MTL=midl.exe









RSC=rc.exe



















!IF  "$(CFG)" == "mod_proxy_fcgi - Win32 Release"



















# PROP BASE Use_MFC 0









# PROP BASE Use_Debug_Libraries 0









# PROP BASE Output_Dir "Release"









# PROP BASE Intermediate_Dir "Release"









# PROP BASE Target_Dir ""









# PROP Use_MFC 0









# PROP Use_Debug_Libraries 0









# PROP Output_Dir "Release"









# PROP Intermediate_Dir "Release"









# 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_fcgi_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_fcgi.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_fcgi.so" /d LONG_NAME="proxy_fcgi_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_fcgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_fcgi.so









# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Release/mod_proxy_fcgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_fcgi.so /opt:ref



















!ELSEIF  "$(CFG)" == "mod_proxy_fcgi - Win32 Debug"



















# PROP BASE Use_MFC 0









# PROP BASE Use_Debug_Libraries 1









# PROP BASE Output_Dir "Debug"









# PROP BASE Intermediate_Dir "Debug"









# PROP BASE Target_Dir ""









# PROP Use_MFC 0









# PROP Use_Debug_Libraries 1









# PROP Output_Dir "Debug"









# PROP Intermediate_Dir "Debug"









# 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_fcgi_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_fcgi.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_fcgi.so" /d LONG_NAME="proxy_fcgi_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_fcgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_fcgi.so









# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:"Debug/mod_proxy_fcgi.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_fcgi.so



















!ENDIF 



















# Begin Target



















# Name "mod_proxy_fcgi - Win32 Release"









# Name "mod_proxy_fcgi - 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_fcgi.c









# End Source File









# End Group









# Begin Group "Header Files"



















# PROP Default_Filter ".h"









# Begin Source File



















SOURCE=.\mod_proxy.h









# End Source File









# Begin Source File



















SOURCE=.\fcgi_protocol.h









# End Source File









# End Group









# Begin Source File



















SOURCE=..\..\build\win32\httpd.rc









# End Source File









# End Target









# End Project
























os/win32/BaseAddr.ref



+1
−0



























Changes for os/win32/BaseAddr.ref: 1 added line, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -75,3 +75,4 @@ mod_dbd.so              0x6FA20000    0x00010000







mod_proxy.so            0x6FA00000    0x00020000









mod_access_compat.so    0x6F9F0000    0x00010000









mod_authz_core.so       0x6F9E0000    0x00010000









mod_proxy_fcgi.so       0x6F9D0000    0x00010000