Index: jk/native - multiple filters/iis/jk_isapi_plugin.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
--- jk/native - multiple filters/iis/jk_isapi_plugin.c	18 May 2005 18:04:53 -0000	1.49
+++ jk/native - multiple filters/iis/jk_isapi_plugin.c	3 Jul 2005 22:45:36 -0000
@@ -51,10 +51,20 @@ 
  * 3. The contents of the Translate header, if any
  *
  */
-#define URI_HEADER_NAME              ("TOMCATURI:")
-#define QUERY_HEADER_NAME            ("TOMCATQUERY:")
-#define WORKER_HEADER_NAME           ("TOMCATWORKER:")
-#define TOMCAT_TRANSLATE_HEADER_NAME ("TOMCATTRANSLATE:")
+#define URI_HEADER_NAME_BASE              ("TOMCATURI")
+#define QUERY_HEADER_NAME_BASE            ("TOMCATQUERY")
+#define WORKER_HEADER_NAME_BASE           ("TOMCATWORKER")
+#define TOMCAT_TRANSLATE_HEADER_NAME_BASE ("TOMCATTRANSLATE")
+
+static char URI_HEADER_NAME[_MAX_FNAME];
+static char QUERY_HEADER_NAME[_MAX_FNAME];
+static char WORKER_HEADER_NAME[_MAX_FNAME];
+static char TOMCAT_TRANSLATE_HEADER_NAME[_MAX_FNAME];
+
+/* The template used to construct our unique headers 
+   from the base name and module instance */
+#define HEADER_TEMPLATE ("%s_%d:")
+
 #define CONTENT_LENGTH               ("CONTENT_LENGTH:")
 
 #define HTTP_URI_HEADER_NAME         ("HTTP_TOMCATURI")
@@ -1090,6 +1100,12 @@ 
         else {
             fReturn = JK_FALSE;
         }
+        /* Construct redirector headers to use for this redirector instance */
+        sprintf(URI_HEADER_NAME, HEADER_TEMPLATE, URI_HEADER_NAME_BASE, hInst);
+        sprintf(QUERY_HEADER_NAME, HEADER_TEMPLATE, QUERY_HEADER_NAME_BASE, hInst);
+        sprintf(WORKER_HEADER_NAME, HEADER_TEMPLATE, WORKER_HEADER_NAME_BASE, hInst);
+        sprintf(TOMCAT_TRANSLATE_HEADER_NAME, HEADER_TEMPLATE, TOMCAT_TRANSLATE_HEADER_NAME_BASE, hInst);
+
     break;
     case DLL_PROCESS_DETACH:
         __try {
@@ -1139,6 +1155,11 @@ 
         jk_log(logger, JK_LOG_DEBUG, "Using worker mount file %s.",
                worker_mount_file);
         jk_log(logger, JK_LOG_DEBUG, "Using uri select %d.", uri_select_option);
+
+        jk_log(logger, JK_LOG_DEBUG, "Using uri header %s.", URI_HEADER_NAME);
+        jk_log(logger, JK_LOG_DEBUG, "Using query header %s.", QUERY_HEADER_NAME);
+        jk_log(logger, JK_LOG_DEBUG, "Using worker header %s.", WORKER_HEADER_NAME);
+        jk_log(logger, JK_LOG_DEBUG, "Using translate header %s.", TOMCAT_TRANSLATE_HEADER_NAME);
     }
     if (uri_worker_map_alloc(&uw_map, NULL, logger)) {
         rc = JK_FALSE;