You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Ryan Bloom <rb...@covalent.net> on 2001/09/06 02:22:19 UTC
Patch for mod_jk and Apache 2.0
This patch allows mod_jk to successfully serve pages against Apache 2.0
and Tomcat 4.0. This is required after the changes to abstract out location
and directory walks from the core request processing. This was created by
Will Rowe and myself.
Ryan
Index: mod_jk.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.18
diff -u -d -b -w -u -r1.18 mod_jk.c
--- mod_jk.c 2001/09/04 10:57:03 1.18
+++ mod_jk.c 2001/09/06 00:17:28
@@ -1333,13 +1333,22 @@
return DECLINED;
}
+static int jk_map_to_storage(request_rec *r)
+{
+ if (apr_table_get(r->notes, JK_WORKER_ID)) {
+ r->filename = apr_filename_of_pathname(r->uri);
+ return OK;
+ }
+ return DECLINED;
+}
+
static void jk_register_hooks(apr_pool_t *p)
{
ap_hook_handler(jk_handler, NULL, NULL, APR_HOOK_MIDDLE);
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_FIRST);
-
+ ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
}
module AP_MODULE_DECLARE_DATA jk_module =
______________________________________________________________
Ryan Bloom rbb@apache.org
Covalent Technologies rbb@covalent.net
--------------------------------------------------------------
Re: Patch for mod_jk and Apache 2.0
Posted by jean-frederic clere <jf...@fujitsu-siemens.com>.
Many thanks. I have committed it.
Ryan Bloom wrote:
>
> This patch allows mod_jk to successfully serve pages against Apache 2.0
> and Tomcat 4.0. This is required after the changes to abstract out location
> and directory walks from the core request processing. This was created by
> Will Rowe and myself.
>
> Ryan
>
> Index: mod_jk.c
> ===================================================================
> RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
> retrieving revision 1.18
> diff -u -d -b -w -u -r1.18 mod_jk.c
> --- mod_jk.c 2001/09/04 10:57:03 1.18
> +++ mod_jk.c 2001/09/06 00:17:28
> @@ -1333,13 +1333,22 @@
> return DECLINED;
> }
>
> +static int jk_map_to_storage(request_rec *r)
> +{
> + if (apr_table_get(r->notes, JK_WORKER_ID)) {
> + r->filename = apr_filename_of_pathname(r->uri);
> + return OK;
> + }
> + return DECLINED;
> +}
> +
> static void jk_register_hooks(apr_pool_t *p)
> {
> ap_hook_handler(jk_handler, NULL, NULL, APR_HOOK_MIDDLE);
> 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_FIRST);
> -
> + ap_hook_map_to_storage(jk_map_to_storage, NULL, NULL, APR_HOOK_MIDDLE);
> }
>
> module AP_MODULE_DECLARE_DATA jk_module =
>
> ______________________________________________________________
> Ryan Bloom rbb@apache.org
> Covalent Technologies rbb@covalent.net
> --------------------------------------------------------------