On 25.09.2010 14:47, Rainer Jung wrote:
On 14.09.2010 13:00, wr...@apache.org wrote:
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 = {
Were the removal of those two MMN checks intended? The log doesn't
indicate it, but since they refer to real ancient 2.0 dev versions, I'd
have no problem with removing it.
Sorry, I didn't see your svn log additions before now.
If so: there's another
#if (MODULE_MAGIC_NUMBER_MAJOR < 20010523)
which goes back even further.
I'll remove that one.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
