mturk 2005/09/12 06:46:01
Modified: jk/native/iis jk_isapi_plugin.c
jk/xdocs changelog.xml
Log:
Fix #35298. Patch provided by Tim Whittington.
Revision Changes Path
1.51 +22 -6 jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- jk_isapi_plugin.c 12 Sep 2005 12:54:31 -0000 1.50
+++ jk_isapi_plugin.c 12 Sep 2005 13:46:00 -0000 1.51
@@ -51,11 +51,22 @@
* 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 CONTENT_LENGTH ("CONTENT_LENGTH:")
+#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_%p:")
+
+#define CONTENT_LENGTH ("CONTENT_LENGTH")
#define HTTP_URI_HEADER_NAME ("HTTP_TOMCATURI")
#define HTTP_QUERY_HEADER_NAME ("HTTP_TOMCATQUERY")
@@ -1090,6 +1101,11 @@
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 {
1.39 +3 -0 jakarta-tomcat-connectors/jk/xdocs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/changelog.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- changelog.xml 12 Sep 2005 13:28:31 -0000 1.38
+++ changelog.xml 12 Sep 2005 13:46:01 -0000 1.39
@@ -35,6 +35,9 @@
<bug>35809</bug>: JkMountCopy don't work for Apache 2.0 Patch provided
by
Christophe Dubach. (mturk)
</fix>
+ <bug>35298</bug>: Multiple JK/ISAPI redirectors on a single IIS site
are not supported
+ Patch provided by Tim Whittington. (mturk)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
