mturk 2005/04/13 04:03:37 Modified: jk/native/common jk_status.c jk_uri_worker_map.h Log: Remove suffix from uri_map. It is not used any more. Revision Changes Path 1.37 +4 -14 jakarta-tomcat-connectors/jk/native/common/jk_status.c Index: jk_status.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- jk_status.c 11 Apr 2005 06:51:36 -0000 1.36 +++ jk_status.c 13 Apr 2005 11:03:37 -0000 1.37 @@ -343,7 +343,7 @@ jk_puts(s, "<br/>Uri Mappings:\n"); jk_puts(s, "<table>\n<tr><th>Match Type</th><th>Uri</th>" - "<th>Context</th><th>Suffix</th></tr>\n"); + "<th>Context</th></tr>\n"); for (i = 0; i < uwmap->size; i++) { uri_worker_record_t *uwr = uwmap->maps[i]; if (strcmp(uwr->worker_name, worker)) { @@ -354,10 +354,6 @@ "</td><td>", NULL); jk_puts(s, uwr->uri); jk_putv(s, "</td><td>", uwr->context, NULL); - if (uwr->suffix) - jk_putv(s, "</td><td>", uwr->suffix, NULL); - else - jk_putv(s, "</td><td>", " ", NULL); jk_puts(s, "</td></tr>\n"); } @@ -375,16 +371,10 @@ if (strcmp(uwr->worker_name, worker)) { continue; } - jk_printf(s, " <jk:map type=\"%s\" uri=\"%s\" context=\"%s\"", + jk_printf(s, " <jk:map type=\"%s\" uri=\"%s\" context=\"%s\" />\n", status_val_match(uwr->match_type), uwr->uri, - uwr->context) ; - - if (uwr->suffix) - jk_putv(s, " suffix=\"", - uwr->suffix, - "\"", NULL); - jk_puts(s, " />\n"); + uwr->context) ; } } 1.18 +1 -4 jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.h Index: jk_uri_worker_map.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- jk_uri_worker_map.h 21 Feb 2005 08:27:13 -0000 1.17 +++ jk_uri_worker_map.h 13 Apr 2005 11:03:37 -0000 1.18 @@ -59,9 +59,6 @@ /* Name of worker mapped */ const char *worker_name; - /* Suffix of uri */ - const char *suffix; - /* Base context */ const char *context;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]