Author: mturk
Date: Sat Oct 11 04:49:02 2008
New Revision: 703650
URL: http://svn.apache.org/viewvc?rev=703650&view=rev
Log:
Make sure extension is inited the same way as filter using _
Modified:
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=703650&r1=703649&r2=703650&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Sat Oct 11 04:49:02
2008
@@ -2102,13 +2102,24 @@
/* Initialise jk */
if (is_inited && !is_mapread) {
- char serverName[MAX_SERVERNAME] = { 0 };
- DWORD dwLen = sizeof(serverName);
- if (lpEcb->
- GetServerVariable(lpEcb->ConnID, SERVER_NAME, serverName,
- &dwLen)) {
- if (dwLen > 0)
+ char serverName[MAX_SERVERNAME] = "";
+ char instanceId[MAX_INSTANCEID] = "";
+
+ DWORD dwLen = MAX_SERVERNAME - MAX_INSTANCEID - 1;
+ if (lpEcb->GetServerVariable(lpEcb->ConnID,
+ SERVER_NAME, serverName, &dwLen)) {
+ if (dwLen > 0) {
serverName[dwLen - 1] = '\0';
+ dwLen = MAX_INSTANCEID;
+ if (lpEcb->GetServerVariable(lpEcb->ConnID,
+ INSTANCE_ID, instanceId, &dwLen)) {
+ if (dwLen > 0) {
+ instanceId[dwLen - 1] = '\0';
+ StringCbCat(serverName, MAX_SERVERNAME, "_");
+ StringCbCat(serverName, MAX_SERVERNAME, instanceId);
+ }
+ }
+ }
if (init_jk(serverName))
is_mapread = JK_TRUE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
