Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 76401 invoked by uid 500); 6 Sep 2001 00:22:31 -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 76389 invoked from network); 6 Sep 2001 00:22:30 -0000 Content-Type: text/plain; charset="iso-8859-1" From: Ryan Bloom Reply-To: rbb@covalent.net Organization: Covalent Technologies To: tomcat-dev@jakarta.apache.org Subject: Patch for mod_jk and Apache 2.0 Date: Wed, 5 Sep 2001 17:22:19 -0700 X-Mailer: KMail [version 1.3] MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-Id: <20010906002220.2DD1346DF4@koj.rkbloom.net> X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N 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 --------------------------------------------------------------