Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 13578 invoked by uid 500); 6 Sep 2001 13:42:22 -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 13547 invoked by uid 500); 6 Sep 2001 13:42:22 -0000 Delivered-To: apmail-jakarta-tomcat-connectors-cvs@apache.org Date: 6 Sep 2001 13:39:29 -0000 Message-ID: <20010906133929.83384.qmail@icarus.apache.org> From: jfclere@apache.org To: jakarta-tomcat-connectors-cvs@apache.org Subject: cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N jfclere 01/09/06 06:39:29 Modified: jk/native/apache-2.0 mod_jk.c Log: This patch allows mod_jk to successfully serve pages against Apache 2.0 and Tomcat. This is required after the changes to abstract out location and directory walks from the core request processing. (since version 2.0.25) Submitted by: Ryan Bloom, rbb@covalent.net Revision Changes Path 1.22 +16 -2 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_jk.c 2001/09/05 17:05:23 1.21 +++ mod_jk.c 2001/09/06 13:39:29 1.22 @@ -60,7 +60,7 @@ * Description: Apache 2 plugin for Jakarta/Tomcat * * Author: Gal Shachor * * Henri Gomez * - * Version: $Revision: 1.21 $ * + * Version: $Revision: 1.22 $ * ***************************************************************************/ /* @@ -1324,13 +1324,27 @@ 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) +{ + if (apr_table_get(r->notes, JK_WORKER_ID)) { + r->filename = apr_filename_of_pathname(r->uri); + return OK; + } + return DECLINED; +} +#endif + 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); - +#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 =