Author: wrowe
Date: Tue Sep 14 11:00:40 2010
New Revision: 996836
URL: http://svn.apache.org/viewvc?rev=996836&view=rev
Log:
Identify JK_ISAPI for jk_version.h PACKAGE definition
Modified:
tomcat/jk/trunk/native/apache-2.0/mod_jk.c
tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp
tomcat/jk/trunk/native/iis/Makefile.amd64
tomcat/jk/trunk/native/iis/Makefile.ia64
tomcat/jk/trunk/native/iis/Makefile.x86
tomcat/jk/trunk/native/iis/isapi.dsp
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.c?rev=996836&r1=996835&r2=996836&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.c Tue Sep 14 11:00:40 2010
@@ -3549,7 +3549,6 @@ static int jk_translate(request_rec * r)
return DECLINED;
}
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20010808)
/* bypass the directory_walk and file_walk for non-file requests */
static int jk_map_to_storage(request_rec * r)
{
@@ -3665,7 +3664,6 @@ static int jk_map_to_storage(request_rec
}
return DECLINED;
}
-#endif
static void jk_register_hooks(apr_pool_t * p)
{
@@ -3673,9 +3671,7 @@ static void jk_register_hooks(apr_pool_t
ap_hook_post_config(jk_post_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_child_init(jk_child_init, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name(jk_translate, NULL, NULL, APR_HOOK_MIDDLE);
-#if (MODULE_MAGIC_NUMBER_MAJOR > 20010808)
ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
-#endif
}
module AP_MODULE_DECLARE_DATA jk_module = {
Modified: tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp?rev=996836&r1=996835&r2=996836&view=diff
==============================================================================
--- tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp (original)
+++ tomcat/jk/trunk/native/apache-2.0/mod_jk.dsp Tue Sep 14 11:00:40 2010
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="apache" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="mod_jk" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-CFG=apache - Win32 Debug
+CFG=mod_jk - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@@ -13,12 +13,14 @@ CFG=apache - Win32 Debug
!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_jk.mak" CFG="apache - Win32 Debug"
+!MESSAGE NMAKE /f "mod_jk.mak" CFG="mod_jk - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "apache - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "apache - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Release httpd 2.0" (based on "Win32 (x86)
Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Debug httpd 2.0" (based on "Win32 (x86) Dynamic-Link
Library")
+!MESSAGE "mod_jk - Win32 Release httpd 2.2" (based on "Win32 (x86)
Dynamic-Link Library")
+!MESSAGE "mod_jk - Win32 Debug httpd 2.2" (based on "Win32 (x86) Dynamic-Link
Library")
!MESSAGE
# Begin Project
@@ -29,7 +31,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "apache - Win32 Release"
+!IF "$(CFG)" == "mod_jk - Win32 Release httpd 2.0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -47,7 +49,7 @@ RSC=rc.exe
# 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"
+# ADD RSC /l 0x409 /fo"Release/mod_jk.res" /I "..\common" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -55,7 +57,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll
/machine:I386
# ADD LINK32 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /debug /machine:I386 /out:"Release/mod_jk.so"
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
-!ELSEIF "$(CFG)" == "apache - Win32 Debug"
+!ELSEIF "$(CFG)" == "mod_jk - Win32 Debug httpd 2.0"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -73,7 +75,7 @@ LINK32=link.exe
# 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"
+# ADD RSC /l 0x409 /fo"Debug/mod_jk.res" /I "..\common" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -81,12 +83,66 @@ 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 libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib
advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug/mod_jk.so" /libpath:"$(APACHE2_HOME)/Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug" /libpath:"$(APACHE2_HOME)\lib"
+!ELSEIF "$(CFG)" == "mod_jk - Win32 Release httpd 2.2"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release22"
+# PROP BASE Intermediate_Dir "Release22"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release22"
+# PROP Intermediate_Dir "Release22"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Release22/mod_jk_src" /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 /fo"Release22/mod_jk.res" /I "..\common" /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib /nologo /dll
/machine:I386
+# ADD LINK32 libhttpd.lib libapr-1.lib libaprutil-1.lib kernel32.lib
user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /debug /machine:I386 /out:"Release22/mod_jk.so"
/libpath:"$(APACHE2_HOME)\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr\Release"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Release"
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
+
+!ELSEIF "$(CFG)" == "mod_jk - Win32 Debug httpd 2.2"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug22"
+# PROP BASE Intermediate_Dir "Debug22"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug22"
+# PROP Intermediate_Dir "Debug22"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /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" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "HAVE_APR" /Fd"Debug22/mod_jk_src" /FD /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 /fo"Debug22/mod_jk.res" /I "..\common" /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 libhttpd.lib libapr-1.lib libaprutil-1.lib kernel32.lib
user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /base:"0x6A6B0000"
/subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Debug22/mod_jk.so" /libpath:"$(APACHE2_HOME)/Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr\Debug"
/libpath:"$(APACHE2_HOME)\srclib\apr-util\Debug" /libpath:"$(APACHE2_HOME)\lib"
+
!ENDIF
# Begin Target
-# Name "apache - Win32 Release"
-# Name "apache - Win32 Debug"
+# Name "mod_jk - Win32 Release httpd 2.0"
+# Name "mod_jk - Win32 Debug httpd 2.0"
+# Name "mod_jk - Win32 Release httpd 2.2"
+# Name "mod_jk - Win32 Debug httpd 2.2"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -290,6 +346,10 @@ SOURCE=..\common\jk_worker.h
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=..\common\jk.rc
+# End Source File
# End Group
# End Target
# End Project
Modified: tomcat/jk/trunk/native/iis/Makefile.amd64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.amd64?rev=996836&r1=996835&r2=996836&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.amd64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.amd64 Tue Sep 14 11:00:40 2010
@@ -151,7 +151,7 @@ CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\isapi_redirect.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\isapi_redirect.res" /i "..\common" /d
"JK_ISAPI" /d "NDEBUG"
SOURCE=..\common\jk.rc
Modified: tomcat/jk/trunk/native/iis/Makefile.ia64
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.ia64?rev=996836&r1=996835&r2=996836&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.ia64 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.ia64 Tue Sep 14 11:00:40 2010
@@ -151,7 +151,7 @@ CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_ISAPI" /d
"NDEBUG"
SOURCE=..\common\jk.rc
Modified: tomcat/jk/trunk/native/iis/Makefile.x86
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/Makefile.x86?rev=996836&r1=996835&r2=996836&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/Makefile.x86 (original)
+++ tomcat/jk/trunk/native/iis/Makefile.x86 Tue Sep 14 11:00:40 2010
@@ -146,7 +146,7 @@ CPP_PROJ=/nologo /MD /W3 /Zi /O2 /I "..\
<<
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d
BASENAME="isapi_redirect" /d "NDEBUG"
+RSC_PROJ=/l 0x409 /fo"$(INTDIR)\jk.res" /i "..\common" /d "JK_ISAPI" /d
"NDEBUG"
SOURCE=..\common\jk.rc
Modified: tomcat/jk/trunk/native/iis/isapi.dsp
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/isapi.dsp?rev=996836&r1=996835&r2=996836&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/isapi.dsp (original)
+++ tomcat/jk/trunk/native/iis/isapi.dsp Tue Sep 14 11:00:40 2010
@@ -47,7 +47,7 @@ RSC=rc.exe
# 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"
+# ADD RSC /l 0x809 /d "JK_ISAPI" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -73,7 +73,7 @@ LINK32=link.exe
# 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"
+# ADD RSC /l 0x809 /d "JK_ISAPI" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
