tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r699569 - in /tomcat/connectors/trunk/jk: native/iis/jk_isapi_plugin.c xdocs/miscellaneous/changelog.xml
Date Sat, 27 Sep 2008 06:41:56 GMT
Author: mturk
Date: Fri Sep 26 23:41:56 2008
New Revision: 699569

URL: http://svn.apache.org/viewvc?rev=699569&view=rev
Log:
Add INSTANCE_ID to the unique shared memory name

Modified:
    tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
    tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml

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=699569&r1=699568&r2=699569&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Fri Sep 26 23:41:56 2008
@@ -25,7 +25,9 @@
  ***************************************************************************/
 
 // This define is needed to include wincrypt,h, needed to get client certificates
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0400
+#endif
 
 #include <httpext.h>
 #include <httpfilt.h>
@@ -113,6 +115,7 @@
 #define BAD_REQUEST     -1
 #define BAD_PATH        -2
 #define MAX_SERVERNAME  128
+#define MAX_INSTANCEID  32
 #define MAX_PACKET_SIZE 65536
 
 char HTML_ERROR_400[] =         "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n"
@@ -184,6 +187,7 @@
 static jk_logger_t *logger = NULL;
 static char *SERVER_NAME = "SERVER_NAME";
 static char *SERVER_SOFTWARE = "SERVER_SOFTWARE";
+static char *INSTANCE_ID = "INSTANCE_ID";
 static char *CONTENT_TYPE = "Content-Type:text/html\r\n\r\n";
 
 static char extension_uri[INTERNET_MAX_URL_LENGTH] =
@@ -1138,12 +1142,22 @@
 {
     /* Initialise jk */
     if (is_inited && !is_mapread) {
-        char serverName[MAX_SERVERNAME];
-        DWORD dwLen = sizeof(serverName);
+        char serverName[MAX_SERVERNAME] = "";
+        char instanceId[MAX_INSTANCEID] = "";
+        DWORD dwLen = MAX_SERVERNAME - MAX_INSTANCEID - 1;
 
         if (pfc->GetServerVariable(pfc, SERVER_NAME, serverName, &dwLen)) {
-            if (dwLen > 0)
+            if (dwLen > 0) {
                 serverName[dwLen - 1] = '\0';
+                dwLen = MAX_INSTANCEID;
+                if (pfc->GetServerVariable(pfc, 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;
         }

Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?rev=699569&r1=699568&r2=699569&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Fri Sep 26 23:41:56 2008
@@ -43,6 +43,13 @@
   <br />
   <subsection name="Native">
     <changelog>
+      <fix>
+        IIS: SERVER_NAME variable can be the same for
+        multiple different server instances if requests
+        are handled according to the ip:port combination.
+        Use INSTANCE_ID variable to which the request
+        belongs instead. (mturk)
+      </fix>
       <update>
         Allow forwarding server error pages. This can be done
         on per-uri basis using new use_server_errors extension.



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message