Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 17844 invoked by uid 500); 4 Oct 2001 13:12:25 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 17835 invoked by uid 500); 4 Oct 2001 13:12:25 -0000 Delivered-To: apmail-jakarta-tomcat-connectors-cvs@apache.org Date: 4 Oct 2001 13:09:42 -0000 Message-ID: <20011004130942.70039.qmail@icarus.apache.org> From: marcsaeg@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c mod_jk.dsp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N marcsaeg 01/10/04 06:09:42 Modified: jk/native/apache-2.0 mod_jk.c mod_jk.dsp Log: Changes to allow builds on Win32 platforms. Revision Changes Path 1.28 +3 -1 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c Index: mod_jk.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- mod_jk.c 2001/10/02 09:41:09 1.27 +++ mod_jk.c 2001/10/04 13:09:42 1.28 @@ -60,7 +60,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * * Author: Gal Shachor * * Henri Gomez * - * Version: $Revision: 1.27 $ * + * Version: $Revision: 1.28 $ * ***************************************************************************/ /* @@ -69,6 +69,8 @@ #include "apu_compat.h" #include "ap_config.h" +#include "apr_lib.h" +#include "apr_date.h" #include "httpd.h" #include "http_config.h" #include "http_request.h" 1.5 +43 -46 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp Index: mod_jk.dsp =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.dsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mod_jk.dsp 2001/06/07 13:54:12 1.4 +++ mod_jk.dsp 2001/10/04 13:09:42 1.5 @@ -43,8 +43,7 @@ # 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 "APACHE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "../common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\src\include" /I "$(APACHE2_HOME)\src\lib\apr\include" /I "$(APACHE2_HOME)\src\os\win32" /D "_WIN32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FD /c -# SUBTRACT CPP /Fr /YX +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include" /I "$(APACHE2_HOME)\os\win32" /D "_WIN32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -54,7 +53,7 @@ # 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 ApacheCore.lib aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /libpath:"$(APACHE2_HOME)\src\lib\apr\Release" /libpath:"$(APACHE2_HOME)\src\CoreR" +# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /machine:I386 /libpath:"$(APACHE2_HOME)\Release" /libpath:"$(APACHE2_HOME)\srclib\apr\Release" /libpath:"$(APACHE2_HOME)\srclib\apr-util\Release" !ELSEIF "$(CFG)" == "apache - Win32 Debug" @@ -70,7 +69,7 @@ # 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 "APACHE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "../common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\src\include" /I "$(APACHE2_HOME)\src\lib\apr\include" /I "$(APACHE2_HOME)\src\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "$(APACHE2_HOME)\include" /I "$(APACHE2_HOME)\srclib\apr\include" /I "$(APACHE2_HOME)\srclib\apr-util\include" /I "$(APACHE2_HOME)\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SHARED_MODULE" /FR /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" @@ -80,7 +79,7 @@ # 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 ApacheCore.lib aprlib.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE2_HOME)\src\lib\apr\Debug" /libpath:"$(APACHE2_HOME)\src\CoreD" +# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(APACHE2_HOME)/Debug" /libpath:"$(APACHE2_HOME)\srclib\apr\Debug" /libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug" !ENDIF @@ -105,10 +104,26 @@ # 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=..\common\jk_jni_worker.c # End Source File # Begin Source File @@ -121,6 +136,10 @@ # 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 @@ -148,49 +167,44 @@ SOURCE=.\mod_jk.c # End Source File # End Group +# Begin Group "Header Files" -SOURCE=..\common\jk_ajp14.c -# End Source File -# End Group +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File -SOURCE=..\common\jk_ajp14_worker.c +SOURCE=..\common\jk_ajp12_worker.h # End Source File -# End Group +# Begin Source File -SOURCE=..\common\jk_md5.c +SOURCE=..\common\jk_ajp13.h # End Source File -# End Group +# Begin Source File -SOURCE=..\common\jk_context.c +SOURCE=..\common\jk_ajp13_worker.h # End Source File -# End Group +# Begin Source File -SOURCE=..\common\jk_ajp_common.c +SOURCE=..\common\jk_ajp14.h # 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 +SOURCE=..\common\jk_ajp14_worker.h # End Source File # Begin Source File -SOURCE=..\common\jk_ajp13.h +SOURCE=..\common\jk_ajp23_worker.h # End Source File # Begin Source File -SOURCE=..\common\jk_ajp13_worker.h +SOURCE=..\common\jk_ajp_common.h # End Source File # Begin Source File -SOURCE=..\common\jk_ajp23_worker.h +SOURCE=..\common\jk_connect.h # End Source File # Begin Source File -SOURCE=..\common\jk_connect.h +SOURCE=..\common\jk_context.h # End Source File # Begin Source File @@ -214,6 +228,10 @@ # 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 @@ -245,27 +263,6 @@ SOURCE=..\common\jk_worker.h # End Source File # End Group - -SOURCE=..\common\jk_ajp14.h -# End Source File -# End Group - -SOURCE=..\common\jk_ajp14_worker.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"