Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Date: 1 Feb 2003 22:17:16 -0000
Message-ID: <20030201221716.86624.qmail@icarus.apache.org>
From: nacho@apache.org
To: jakarta-tomcat-connectors-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi
 jk_isapi_plugin.c jk_service_iis.c

nacho       2003/02/01 14:17:16

  Modified:    jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  Fix for Bug#16638   Jk2 connector with Microsoft IIS slow in multiple domain environment
  
  Added a new registry and properties config "send_groups". defaults to false.
  
  Revision  Changes    Path
  1.52      +14 -1     jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c
  
  Index: jk_isapi_plugin.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_isapi_plugin.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- jk_isapi_plugin.c	26 Oct 2002 12:42:44 -0000	1.51
  +++ jk_isapi_plugin.c	1 Feb 2003 22:17:16 -0000	1.52
  @@ -87,6 +87,7 @@
   #define WORKERS_FILE_TAG        ("workersFile")
   #define USE_AUTH_COMP_TAG       ("authComplete")
   #define THREAD_POOL_TAG         ("threadPool")
  +#define SEND_GROUPS_TAG         ("sendGroups")
   
   
   static char  file_name[_MAX_PATH];
  @@ -97,6 +98,7 @@
   static int   was_inited = JK_FALSE;
   static DWORD auth_notification_flags = 0;
   static int   use_auth_notification_flags = 0;
  +int          send_groups = 0;
   
   static jk_workerEnv_t *workerEnv;
   apr_pool_t *jk_globalPool;
  @@ -668,6 +670,10 @@
               if (tmp) {
                   use_auth_notification_flags = atoi(tmp);
               }
  +            tmp = map->get(env,map,SEND_GROUPS_TAG);
  +            if (tmp) {
  +                send_groups = atoi(tmp);
  +            }
               using_ini_file=JK_TRUE;            
               return ok;
           }     
  @@ -727,6 +733,13 @@
                                        tmpbuf,
                                        8)) {
           use_auth_notification_flags = atoi(tmpbuf);
  +    }
  +
  +    if(get_registry_config_parameter(hkey,
  +                                     SEND_GROUPS_TAG,
  +                                     tmpbuf,
  +                                     8)) {
  +        send_groups = atoi(tmpbuf);
       }
   
       RegCloseKey(hkey);
  
  
  
  1.22      +3 -1      jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c
  
  Index: jk_service_iis.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/isapi/jk_service_iis.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jk_service_iis.c	21 Sep 2002 07:28:48 -0000	1.21
  +++ jk_service_iis.c	1 Feb 2003 22:17:16 -0000	1.22
  @@ -81,6 +81,8 @@
   
   #define ROLES_ATTRIBUTE_NAME  "org.apache.tomcat.jk.roles"
   
  +extern int send_groups;
  +
   static int JK_METHOD jk2_service_iis_head(jk_env_t *env, jk_ws_service_t *s ){
       static char crlf[3] = { (char)13, (char)10, '\0' };
       const char *reason;
  @@ -407,7 +409,7 @@
        * Add SSL IIS environment
        */
   
  -    if ( strlen(s->remote_user) > 0 ){
  +    if ( send_groups && (strlen(s->remote_user) > 0 )){
           char *groups=jk2_service_iis_get_roles(env, s);
           if( groups != NULL){
               s->attributes->put( env, s->attributes,ROLES_ATTRIBUTE_NAME,groups,NULL);
  
  
  

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