andya 01/06/23 08:56:56 Modified: jk/native/iis jk_isapi_plugin.c isapi.dsw isapi.dsp Added: jk/native/iis isapi.mak Log: Fixed isapi.dsp and added isapi.mak. Fixed some syntax errors in jk_isapi.plugin.c Revision Changes Path 1.5 +6 -6 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c Index: jk_isapi_plugin.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_isapi_plugin.c 2001/06/18 14:37:29 1.4 +++ jk_isapi_plugin.c 2001/06/23 15:56:55 1.5 @@ -58,7 +58,7 @@ /*************************************************************************** * Description: ISAPI plugin for IIS/PWS * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.4 $ * + * Version: $Revision: 1.5 $ * ***************************************************************************/ #include <httpext.h> @@ -643,10 +643,10 @@ rc = JK_FALSE; if(map_alloc(&map)) { if(map_read_properties(map, worker_file)) { - /* we add the URI->WORKER MAP since workers using AJP14 will feed it */ - worker_env.uri_to_worker = uw_map; - GET_SERVER_VARIABLE_VALUE("SERVER_SOFTWARE", worker_end.server_name); - if(wc_open(map, worker_env, logger)) { + /* we add the URI->WORKER MAP since workers using AJP14 will feed it */ + /*worker_env.uri_to_worker = uw_map; + GET_SERVER_VARIABLE_VALUE("SERVER_SOFTWARE", worker_env.server_name);*/ + if(wc_open(map, &worker_env, logger)) { rc = JK_TRUE; } } @@ -800,7 +800,7 @@ s->ssl_cert_len = 0; s->ssl_cipher = NULL; s->ssl_session = NULL; - s->ssl_keysize = -1; + s->ssl_key_size = -1; s->headers_names = NULL; s->headers_values = NULL; 1.2 +29 -29 jakarta-tomcat-connectors/jk/native/iis/isapi.dsw Index: isapi.dsw =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- isapi.dsw 2001/05/14 09:47:28 1.1 +++ isapi.dsw 2001/06/23 15:56:55 1.2 @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "isapi"=".\isapi.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "isapi"=".\isapi.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + 1.4 +283 -277 jakarta-tomcat-connectors/jk/native/iis/isapi.dsp Index: isapi.dsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- isapi.dsp 2001/06/07 14:13:09 1.3 +++ isapi.dsp 2001/06/23 15:56:55 1.4 @@ -1,277 +1,283 @@ -# Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=isapi - Win32 Debug -!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 "isapi.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 "isapi.mak" CFG="isapi - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "isapi - 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)" == "isapi - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "isapi___Win32_Release" -# PROP BASE Intermediate_Dir "isapi___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "isapi_release" -# PROP Intermediate_Dir "isapi_release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:"isapi_release/isapi_redirect.dll" - -!ELSEIF "$(CFG)" == "isapi - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "isapi___Win32_Debug" -# PROP BASE Intermediate_Dir "isapi___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "isapi_debug" -# PROP Intermediate_Dir "isapi_debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"isapi_debug/isapi_redirect.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "isapi - Win32 Release" -# Name "isapi - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\isapi.def -# End Source File -# Begin Source File - -SOURCE=..\common\jk_ajp12_worker.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_ajp13.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_ajp13_worker.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_connect.c -# End Source File -# Begin Source File - -SOURCE=.\jk_isapi_plugin.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_jni_worker.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_lb_worker.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_map.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_msg_buff.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_pool.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_sockbuf.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_uri_worker_map.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_util.c -# End Source File -# Begin Source File - -SOURCE=..\common\jk_worker.c -# End Source File -# End Group - -SOURCE=..\common\jk_ajp14.c -# End Source File -# End Group - -SOURCE=..\common\jk_ajp14_worker.c -# End Source File -# End Group - -SOURCE=..\common\jk_md5.c -# End Source File -# End Group - -SOURCE=..\common\jk_context.c -# End Source File -# End Group - -SOURCE=..\common\jk_ajp_common.c -# End Source File -# End Group - -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\common\jk_ajp12_worker.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_ajp13_worker.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_ajp14_worker.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_connect.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_global.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_jni_worker.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_lb_worker.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_logger.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_map.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_msg_buff.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_mt.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_pool.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_service.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_sockbuf.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_uri_worker_map.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_util.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_worker.h -# End Source File -# Begin Source File - -SOURCE=..\common\jk_worker_list.h -# End Source File -# End Group - -SOURCE=..\common\jk_ajp13.h -# End Source File -# End Group - -SOURCE=..\common\jk_ajp14.h -# End Source File -# End Group - -SOURCE=..\common\jk_md5.h -# End Source File -# End Group - -SOURCE=..\common\jk_context.h -# End Source File -# End Group - -SOURCE=..\common\jk_ajp_common.h -# End Source File -# End Group - -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="isapi" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=isapi - Win32 Debug +!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 "isapi.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 "isapi.mak" CFG="isapi - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "isapi - 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)" == "isapi - 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 "isapi_release" +# PROP Intermediate_Dir "isapi_release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 wsock32.lib advapi32.lib /nologo /dll /machine:I386 /out:"isapi_release\isapi_redirect.dll" + +!ELSEIF "$(CFG)" == "isapi - 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 "isapi_debug" +# PROP Intermediate_Dir "isapi_debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /FR /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 wsock32.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"isapi_debug\isapi_redirect.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "isapi - Win32 Release" +# Name "isapi - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\isapi.def +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp12_worker.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp13.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp13_worker.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp14.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp14_worker.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp_common.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_connect.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_context.c +# End Source File +# Begin Source File + +SOURCE=.\jk_isapi_plugin.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_jni_worker.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_lb_worker.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_map.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_md5.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_msg_buff.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_nwmain.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_pool.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_sockbuf.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_uri_worker_map.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_util.c +# End Source File +# Begin Source File + +SOURCE=..\common\jk_worker.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\common\jk_ajp12_worker.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp13.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp13_worker.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp14.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp14_worker.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_ajp_common.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_connect.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_context.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_global.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_jni_worker.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_lb_worker.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_logger.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_map.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_md5.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_msg_buff.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_mt.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_pool.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_service.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_sockbuf.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_uri_worker_map.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_util.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_version.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_worker.h +# End Source File +# Begin Source File + +SOURCE=..\common\jk_worker_list.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project 1.1 jakarta-tomcat-connectors/jk/native/iis/isapi.mak Index: isapi.mak =================================================================== # Microsoft Developer Studio Generated NMAKE File, Based on isapi.dsp !IF "$(CFG)" == "" CFG=isapi - Win32 Debug !MESSAGE No configuration specified. Defaulting to isapi - Win32 Debug. !ENDIF !IF "$(CFG)" != "isapi - Win32 Release" && "$(CFG)" != "isapi - Win32 Debug" !MESSAGE Invalid configuration "$(CFG)" specified. !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 "isapi.mak" CFG="isapi - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "isapi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "isapi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE !ERROR An invalid configuration is specified. !ENDIF !IF "$(OS)" == "Windows_NT" NULL= !ELSE NULL=nul !ENDIF CPP=cl.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "isapi - Win32 Release" OUTDIR=.\isapi_release INTDIR=.\isapi_release # Begin Custom Macros OutDir=.\isapi_release # End Custom Macros ALL : "$(OUTDIR)\isapi_redirect.dll" CLEAN : -@erase "$(INTDIR)\jk_ajp12_worker.obj" -@erase "$(INTDIR)\jk_ajp13.obj" -@erase "$(INTDIR)\jk_ajp13_worker.obj" -@erase "$(INTDIR)\jk_ajp14.obj" -@erase "$(INTDIR)\jk_ajp14_worker.obj" -@erase "$(INTDIR)\jk_ajp_common.obj" -@erase "$(INTDIR)\jk_connect.obj" -@erase "$(INTDIR)\jk_context.obj" -@erase "$(INTDIR)\jk_isapi_plugin.obj" -@erase "$(INTDIR)\jk_jni_worker.obj" -@erase "$(INTDIR)\jk_lb_worker.obj" -@erase "$(INTDIR)\jk_map.obj" -@erase "$(INTDIR)\jk_md5.obj" -@erase "$(INTDIR)\jk_msg_buff.obj" -@erase "$(INTDIR)\jk_nwmain.obj" -@erase "$(INTDIR)\jk_pool.obj" -@erase "$(INTDIR)\jk_sockbuf.obj" -@erase "$(INTDIR)\jk_uri_worker_map.obj" -@erase "$(INTDIR)\jk_util.obj" -@erase "$(INTDIR)\jk_worker.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\isapi_redirect.dll" -@erase "$(OUTDIR)\isapi_redirect.exp" -@erase "$(OUTDIR)\isapi_redirect.lib" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /Fp"$(INTDIR)\isapi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.bsc" BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=wsock32.lib advapi32.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\isapi_redirect.pdb" /machine:I386 /def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib" DEF_FILE= \ ".\isapi.def" LINK32_OBJS= \ "$(INTDIR)\jk_ajp12_worker.obj" \ "$(INTDIR)\jk_ajp13.obj" \ "$(INTDIR)\jk_ajp13_worker.obj" \ "$(INTDIR)\jk_ajp14.obj" \ "$(INTDIR)\jk_ajp14_worker.obj" \ "$(INTDIR)\jk_ajp_common.obj" \ "$(INTDIR)\jk_connect.obj" \ "$(INTDIR)\jk_context.obj" \ "$(INTDIR)\jk_isapi_plugin.obj" \ "$(INTDIR)\jk_jni_worker.obj" \ "$(INTDIR)\jk_lb_worker.obj" \ "$(INTDIR)\jk_map.obj" \ "$(INTDIR)\jk_md5.obj" \ "$(INTDIR)\jk_msg_buff.obj" \ "$(INTDIR)\jk_nwmain.obj" \ "$(INTDIR)\jk_pool.obj" \ "$(INTDIR)\jk_sockbuf.obj" \ "$(INTDIR)\jk_uri_worker_map.obj" \ "$(INTDIR)\jk_util.obj" \ "$(INTDIR)\jk_worker.obj" "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ELSEIF "$(CFG)" == "isapi - Win32 Debug" OUTDIR=.\isapi_debug INTDIR=.\isapi_debug # Begin Custom Macros OutDir=.\isapi_debug # End Custom Macros ALL : "$(OUTDIR)\isapi_redirect.dll" "$(OUTDIR)\isapi.bsc" CLEAN : -@erase "$(INTDIR)\jk_ajp12_worker.obj" -@erase "$(INTDIR)\jk_ajp12_worker.sbr" -@erase "$(INTDIR)\jk_ajp13.obj" -@erase "$(INTDIR)\jk_ajp13.sbr" -@erase "$(INTDIR)\jk_ajp13_worker.obj" -@erase "$(INTDIR)\jk_ajp13_worker.sbr" -@erase "$(INTDIR)\jk_ajp14.obj" -@erase "$(INTDIR)\jk_ajp14.sbr" -@erase "$(INTDIR)\jk_ajp14_worker.obj" -@erase "$(INTDIR)\jk_ajp14_worker.sbr" -@erase "$(INTDIR)\jk_ajp_common.obj" -@erase "$(INTDIR)\jk_ajp_common.sbr" -@erase "$(INTDIR)\jk_connect.obj" -@erase "$(INTDIR)\jk_connect.sbr" -@erase "$(INTDIR)\jk_context.obj" -@erase "$(INTDIR)\jk_context.sbr" -@erase "$(INTDIR)\jk_isapi_plugin.obj" -@erase "$(INTDIR)\jk_isapi_plugin.sbr" -@erase "$(INTDIR)\jk_jni_worker.obj" -@erase "$(INTDIR)\jk_jni_worker.sbr" -@erase "$(INTDIR)\jk_lb_worker.obj" -@erase "$(INTDIR)\jk_lb_worker.sbr" -@erase "$(INTDIR)\jk_map.obj" -@erase "$(INTDIR)\jk_map.sbr" -@erase "$(INTDIR)\jk_md5.obj" -@erase "$(INTDIR)\jk_md5.sbr" -@erase "$(INTDIR)\jk_msg_buff.obj" -@erase "$(INTDIR)\jk_msg_buff.sbr" -@erase "$(INTDIR)\jk_nwmain.obj" -@erase "$(INTDIR)\jk_nwmain.sbr" -@erase "$(INTDIR)\jk_pool.obj" -@erase "$(INTDIR)\jk_pool.sbr" -@erase "$(INTDIR)\jk_sockbuf.obj" -@erase "$(INTDIR)\jk_sockbuf.sbr" -@erase "$(INTDIR)\jk_uri_worker_map.obj" -@erase "$(INTDIR)\jk_uri_worker_map.sbr" -@erase "$(INTDIR)\jk_util.obj" -@erase "$(INTDIR)\jk_util.sbr" -@erase "$(INTDIR)\jk_worker.obj" -@erase "$(INTDIR)\jk_worker.sbr" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" -@erase "$(OUTDIR)\isapi.bsc" -@erase "$(OUTDIR)\isapi_redirect.dll" -@erase "$(OUTDIR)\isapi_redirect.exp" -@erase "$(OUTDIR)\isapi_redirect.ilk" -@erase "$(OUTDIR)\isapi_redirect.lib" -@erase "$(OUTDIR)\isapi_redirect.pdb" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\isapi.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\isapi.bsc" BSC32_SBRS= \ "$(INTDIR)\jk_isapi_plugin.sbr" \ "$(INTDIR)\jk_worker.sbr" \ "$(INTDIR)\jk_ajp12_worker.sbr" \ "$(INTDIR)\jk_ajp13.sbr" \ "$(INTDIR)\jk_ajp13_worker.sbr" \ "$(INTDIR)\jk_ajp14.sbr" \ "$(INTDIR)\jk_ajp14_worker.sbr" \ "$(INTDIR)\jk_connect.sbr" \ "$(INTDIR)\jk_context.sbr" \ "$(INTDIR)\jk_jni_worker.sbr" \ "$(INTDIR)\jk_lb_worker.sbr" \ "$(INTDIR)\jk_map.sbr" \ "$(INTDIR)\jk_md5.sbr" \ "$(INTDIR)\jk_msg_buff.sbr" \ "$(INTDIR)\jk_nwmain.sbr" \ "$(INTDIR)\jk_pool.sbr" \ "$(INTDIR)\jk_sockbuf.sbr" \ "$(INTDIR)\jk_uri_worker_map.sbr" \ "$(INTDIR)\jk_util.sbr" \ "$(INTDIR)\jk_ajp_common.sbr" "$(OUTDIR)\isapi.bsc" : "$(OUTDIR)" $(BSC32_SBRS) $(BSC32) @<< $(BSC32_FLAGS) $(BSC32_SBRS) << LINK32=link.exe LINK32_FLAGS=wsock32.lib advapi32.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\isapi_redirect.pdb" /debug /machine:I386 /def:".\isapi.def" /out:"$(OUTDIR)\isapi_redirect.dll" /implib:"$(OUTDIR)\isapi_redirect.lib" /pdbtype:sept DEF_FILE= \ ".\isapi.def" LINK32_OBJS= \ "$(INTDIR)\jk_ajp12_worker.obj" \ "$(INTDIR)\jk_ajp13.obj" \ "$(INTDIR)\jk_ajp13_worker.obj" \ "$(INTDIR)\jk_ajp14.obj" \ "$(INTDIR)\jk_ajp14_worker.obj" \ "$(INTDIR)\jk_ajp_common.obj" \ "$(INTDIR)\jk_connect.obj" \ "$(INTDIR)\jk_context.obj" \ "$(INTDIR)\jk_isapi_plugin.obj" \ "$(INTDIR)\jk_jni_worker.obj" \ "$(INTDIR)\jk_lb_worker.obj" \ "$(INTDIR)\jk_map.obj" \ "$(INTDIR)\jk_md5.obj" \ "$(INTDIR)\jk_msg_buff.obj" \ "$(INTDIR)\jk_nwmain.obj" \ "$(INTDIR)\jk_pool.obj" \ "$(INTDIR)\jk_sockbuf.obj" \ "$(INTDIR)\jk_uri_worker_map.obj" \ "$(INTDIR)\jk_util.obj" \ "$(INTDIR)\jk_worker.obj" "$(OUTDIR)\isapi_redirect.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << !ENDIF .c{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << .cpp{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << .cxx{$(INTDIR)}.obj:: $(CPP) @<< $(CPP_PROJ) $< << .c{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << .cpp{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << .cxx{$(INTDIR)}.sbr:: $(CPP) @<< $(CPP_PROJ) $< << !IF "$(NO_EXTERNAL_DEPS)" != "1" !IF EXISTS("isapi.dep") !INCLUDE "isapi.dep" !ELSE !MESSAGE Warning: cannot find "isapi.dep" !ENDIF !ENDIF !IF "$(CFG)" == "isapi - Win32 Release" || "$(CFG)" == "isapi - Win32 Debug" SOURCE=..\common\jk_ajp12_worker.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_ajp12_worker.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_ajp12_worker.obj" "$(INTDIR)\jk_ajp12_worker.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_ajp13.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_ajp13.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_ajp13.obj" "$(INTDIR)\jk_ajp13.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_ajp13_worker.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_ajp13_worker.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_ajp13_worker.obj" "$(INTDIR)\jk_ajp13_worker.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_ajp14.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_ajp14.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_ajp14.obj" "$(INTDIR)\jk_ajp14.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_ajp14_worker.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_ajp14_worker.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_ajp14_worker.obj" "$(INTDIR)\jk_ajp14_worker.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_ajp_common.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_ajp_common.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_ajp_common.obj" "$(INTDIR)\jk_ajp_common.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_connect.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_connect.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_connect.obj" "$(INTDIR)\jk_connect.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_context.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_context.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_context.obj" "$(INTDIR)\jk_context.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=.\jk_isapi_plugin.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_isapi_plugin.obj" : $(SOURCE) "$(INTDIR)" !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_isapi_plugin.obj" "$(INTDIR)\jk_isapi_plugin.sbr" : $(SOURCE) "$(INTDIR)" !ENDIF SOURCE=..\common\jk_jni_worker.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_jni_worker.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_jni_worker.obj" "$(INTDIR)\jk_jni_worker.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_lb_worker.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_lb_worker.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_lb_worker.obj" "$(INTDIR)\jk_lb_worker.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_map.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_map.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_map.obj" "$(INTDIR)\jk_map.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_md5.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_md5.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_md5.obj" "$(INTDIR)\jk_md5.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_msg_buff.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_msg_buff.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_msg_buff.obj" "$(INTDIR)\jk_msg_buff.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_nwmain.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_nwmain.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_nwmain.obj" "$(INTDIR)\jk_nwmain.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_pool.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_pool.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_pool.obj" "$(INTDIR)\jk_pool.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_sockbuf.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_sockbuf.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_sockbuf.obj" "$(INTDIR)\jk_sockbuf.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_uri_worker_map.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_uri_worker_map.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_uri_worker_map.obj" "$(INTDIR)\jk_uri_worker_map.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_util.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_util.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_util.obj" "$(INTDIR)\jk_util.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF SOURCE=..\common\jk_worker.c !IF "$(CFG)" == "isapi - Win32 Release" "$(INTDIR)\jk_worker.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ELSEIF "$(CFG)" == "isapi - Win32 Debug" "$(INTDIR)\jk_worker.obj" "$(INTDIR)\jk_worker.sbr" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) !ENDIF !ENDIF