--- mod_jk.c	Fri Jan 19 17:08:15 2001
+++ /home/jamey/tmp/mod_jk.c	Mon Jan 22 13:13:03 2001
@@ -88,10 +88,8 @@
 #endif
 #include "jk_global.h"
 #include "jk_util.h"
-#include "jk_logger.h"
 #include "jk_map.h"
 #include "jk_pool.h"
-#include "jk_util.h"
 #include "jk_service.h"
 #include "jk_worker.h"
 #include "jk_uri_worker_map.h"
@@ -472,7 +470,7 @@
     return NULL;
 }
 
-static const char *jk_set_worker_file(cmd_parms *cmd, 
+static const char *jk_set_wroker_file(cmd_parms *cmd, 
                                       void *dummy, 
                                       char *worker_file)
 {
@@ -605,7 +603,7 @@
      * This file defines the different workers used by apache to redirect 
      * servlet requests.
      */
-    {"JkWorkersFile", jk_set_worker_file, NULL, RSRC_CONF, TAKE1,
+    {"JkWorkersFile", jk_set_wroker_file, NULL, RSRC_CONF, TAKE1,
      "the name of a worker file for the Jakarta servlet containers"},
     /*
      * JkMount mounts a url prefix to a worker (the worker need to be
@@ -659,9 +657,9 @@
 /* ========================================================================= */
 /* The JK module handlers                                                    */
 /* ========================================================================= */
-static int jk_handler(request_rec *r, char *worker_name)
+static int jk_handler(request_rec *r)
 {   
-//	const char *worker_name = ap_table_get(r->notes, JK_WORKER_ID);
+    const char *worker_name = ap_table_get(r->notes, JK_WORKER_ID);
 
     if(r->proxyreq) {
         return HTTP_INTERNAL_SERVER_ERROR;
@@ -886,10 +884,10 @@
             char *worker = map_uri_to_worker(conf->uw_map, 
                                              r->uri, 
                                              conf->log ? conf->log : main_log);
+
             if(worker) {
-				return jk_handler(r, worker);
-//				r->handler = ap_pstrdup(r->pool, JK_HANDLER);
-//				ap_table_setn(r->notes, JK_WORKER_ID, worker);
+                r->handler = ap_pstrdup(r->pool, JK_HANDLER);
+                ap_table_setn(r->notes, JK_WORKER_ID, worker);
             }
         }
     }
@@ -899,8 +897,8 @@
 
 static const handler_rec jk_handlers[] =
 {
-    { JK_MAGIC_TYPE, jk_translate },
-    { JK_HANDLER, jk_translate },    
+    { JK_MAGIC_TYPE, jk_handler },
+    { JK_HANDLER, jk_handler },    
     { NULL }
 };
 
@@ -913,7 +911,7 @@
     merge_jk_config,            /* server config merger */
     jk_cmds,                    /* command table */
     jk_handlers,                /* [7] list of handlers */
-    NULL, //jk_translate,               /* [2] filename-to-URI translation */
+    jk_translate,               /* [2] filename-to-URI translation */
     NULL,                       /* [5] check/validate user_id */
     NULL,                       /* [6] check user_id is valid *here* */
     NULL,                       /* [4] check access by host address */
