cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c

2003-02-01 Thread nacho 
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  ChangesPath
  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 -  1.51
  +++ jk_isapi_plugin.c 1 Feb 2003 22:17:16 -   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 -  1.21
  +++ jk_service_iis.c  1 Feb 2003 22:17:16 -   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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c

2002-07-07 Thread nacho 

nacho   2002/07/07 17:26:07

  Modified:jk/java/org/apache/jk/common ChannelSocket.java
JkInputStream.java
   jk/native2/common jk_worker_ajp13.c
   jk/native2/include jk_service.h
   jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  * Fix for PUT problmes in tc417+IIS+slide
  
  Revision  ChangesPath
  1.19  +1 -1  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
  
  Index: ChannelSocket.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ChannelSocket.java2 Jul 2002 20:00:15 -   1.18
  +++ ChannelSocket.java8 Jul 2002 00:26:07 -   1.19
  @@ -383,7 +383,7 @@
   
   total_read = this.read(ep, buf, hlen, blen);
   
  -if (total_read <= 0) {
  +if ((total_read <= 0) && (blen > 0)) {
   log.warn("can't read body, waited #" + blen);
   return  -1;
   }
  
  
  
  1.12  +4 -3  
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java
  
  Index: JkInputStream.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/JkInputStream.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JkInputStream.java29 Jun 2002 22:39:13 -  1.11
  +++ JkInputStream.java8 Jul 2002 00:26:07 -   1.12
  @@ -276,12 +276,13 @@
   if( log.isDebugEnabled())
   log.debug( "doRead " + pos + " " + blen + " " + available + " " + 
end_of_stream+
  " " + responseChunk.getOffset()+ " " + 
responseChunk.getLength());
  -if( contentLength == pos ) {
  -end_of_stream=true;
  +if( end_of_stream ) {
   return -1;
   }
   if( blen == pos ) {
  -refillReadBuffer();
  +if ( !refillReadBuffer() ){
  +return -1;
  +}
   }
   responseChunk.setBytes( bodyBuff, pos, blen );
   pos=blen;
  
  
  
  1.37  +4 -0  jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c
  
  Index: jk_worker_ajp13.c
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- jk_worker_ajp13.c 29 Jun 2002 18:29:51 -  1.36
  +++ jk_worker_ajp13.c 8 Jul 2002 00:26:07 -   1.37
  @@ -496,6 +496,10 @@
   } else {
   err=jk2_worker_ajp13_forwardSingleThread( env, w, s, e );
   }
  +if (err != JK_OK){
  +env->l->jkLog(env, env->l, JK_LOG_ERROR,
  +  "ajp13.service() Error  forwarding %s\n", e->worker->mbean->name);
  +}
   
   if( w->mbean->debug > 0 ) 
   env->l->jkLog(env, env->l, JK_LOG_INFO,
  
  
  
  1.16  +2 -1  jakarta-tomcat-connectors/jk/native2/include/jk_service.h
  
  Index: jk_service.h
  ===
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- jk_service.h  5 Jun 2002 21:56:39 -   1.15
  +++ jk_service.h  8 Jul 2002 00:26:07 -   1.16
  @@ -204,6 +204,7 @@
   unsigned is_chunked;/* 1 if content length is unknown (chunked rq) */
   unsigned no_more_chunks;/* 1 if last chunk has been read */
   long content_read;  /* number of bytes read */
  +int  end_of_stream; /* For IIS avoids blocking calls to 
lpEcb->ReadClient */
   
   /*
* SSL information
  
  
  
  1.36  +3 -3  
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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- jk_isapi_plugin.c 6 Jul 2002 08:05:49 -   1.35
  +++ jk_isapi_plugin.c 8 Jul 2002 00:26:07 -   1.36
  @@ -2,7 +2,7 @@
*   *
* The Apache Software License,  Version 1.1 *
*   *
  - *  Copyright (c) 1999-2001 The Apache Software Foundation.  *
  + *  Copyright (c) 1999-2002 The Apache Software Foundation.  *
*

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c

2002-05-10 Thread nacho 

nacho   02/05/10 16:15:35

  Modified:jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  * JK2 isapi redirector is working!!
  
  Found the latest blocking bug, now needs extensive testing :)
  
  Revision  ChangesPath
  1.14  +9 -6  
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_isapi_plugin.c 4 May 2002 19:06:31 -   1.13
  +++ jk_isapi_plugin.c 10 May 2002 23:15:35 -  1.14
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Larry Isaacs <[EMAIL PROTECTED]>   *
* Author:  Ignacio J. Ortega <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.13 $   *
  + * Version: $Revision: 1.14 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -181,8 +181,8 @@
   DWORD dwNotificationType, 
   LPVOID pvNotification)
   {
  -jk_env_t *env; 
  -jk_uriEnv_t *uriEnv;
  +jk_env_t *env=NULL; 
  +jk_uriEnv_t *uriEnv=NULL;
   
   /* Initialise jk */
   if (is_inited && !is_mapread) {
  @@ -480,6 +480,12 @@
   
   if (JK_OK == worker->service(env, worker, s)){
   rc=HSE_STATUS_SUCCESS;
  +lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
  +env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  +   "HttpExtensionProc service() returned OK\n");
  +} else {
  +env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  +   "HttpExtensionProc service() Failed\n");
   }
   
   s->afterRequest(env, s);
  @@ -488,9 +494,6 @@
   
   rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );
   
  -lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
  -env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  -   "HttpExtensionProc service() returned OK\n");
   } else {
   env->l->jkLog(env, env->l,  JK_LOG_ERROR, 
  "HttpExtensionProc error, not initialized\n");
  
  
  
  1.15  +1 -0  
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_service_iis.c  4 May 2002 19:06:31 -   1.14
  +++ jk_service_iis.c  10 May 2002 23:15:35 -  1.15
  @@ -143,6 +143,7 @@
   strcat(headers_str, s->headers_out->valueAt(env,s->headers_out,i));
   strcat(headers_str, crlf);
   }
  +strcat(headers_str, crlf);
   } else {
   headers_str = crlf;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c

2002-05-04 Thread nacho 

nacho   02/05/04 12:06:31

  Modified:jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  * Fixed it seems that the pool now resides at the mbean
  
  Revision  ChangesPath
  1.13  +2 -2  
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jk_isapi_plugin.c 1 May 2002 22:23:36 -   1.12
  +++ jk_isapi_plugin.c 4 May 2002 19:06:31 -   1.13
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Larry Isaacs <[EMAIL PROTECTED]>   *
* Author:  Ignacio J. Ortega <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.12 $   *
  + * Version: $Revision: 1.13 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -463,7 +463,7 @@
  be shared with other server adapters */
   rPool= worker->rPoolCache->get( env, worker->rPoolCache );
   if( rPool == NULL ) {
  -rPool=worker->pool->create( env, worker->pool, HUGE_POOL_SIZE );
  +rPool=worker->mbean->pool->create( env, worker->mbean->pool, 
HUGE_POOL_SIZE );
   env->l->jkLog(env, env->l, JK_LOG_INFO,
 "HttpExtensionProc: new rpool\n");
   }
  
  
  
  1.14  +11 -11
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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_service_iis.c  1 May 2002 22:23:36 -   1.13
  +++ jk_service_iis.c  4 May 2002 19:06:31 -   1.14
  @@ -285,26 +285,26 @@
   
   s->jvm_route = NULL;
   
  -GET_SERVER_VARIABLE_VALUE(w->pool,HTTP_URI_HEADER_NAME, s->req_uri); 
  -GET_SERVER_VARIABLE_VALUE(w->pool,HTTP_QUERY_HEADER_NAME, s->query_string); 
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,HTTP_URI_HEADER_NAME, s->req_uri); 
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,HTTP_QUERY_HEADER_NAME, 
s->query_string); 
   
   if (s->req_uri == NULL) {
   s->query_string = lpEcb->lpszQueryString;
   /* *worker_name= DEFAULT_WORKER_NAME; */
  -GET_SERVER_VARIABLE_VALUE(w->pool,"URL", s->req_uri);   
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"URL", s->req_uri);   
   if (jk_requtil_unescapeUrl(s->req_uri) < 0)
   return JK_ERR;
   jk_requtil_getParents(s->req_uri);
   }
   
  -GET_SERVER_VARIABLE_VALUE(w->pool,"AUTH_TYPE", s->auth_type);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_USER", s->remote_user);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"SERVER_PROTOCOL", s->protocol);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_HOST", s->remote_host);
  -GET_SERVER_VARIABLE_VALUE(w->pool,"REMOTE_ADDR", s->remote_addr);
  -GET_SERVER_VARIABLE_VALUE(w->pool,SERVER_NAME, s->server_name);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"AUTH_TYPE", s->auth_type);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_USER", s->remote_user);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"SERVER_PROTOCOL", s->protocol);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_HOST", s->remote_host);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,"REMOTE_ADDR", s->remote_addr);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_NAME, s->server_name);
   GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT", s->server_port, 80);
  -GET_SERVER_VARIABLE_VALUE(w->pool,SERVER_SOFTWARE, s->server_software);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,SERVER_SOFTWARE, s->server_software);
   GET_SERVER_VARIABLE_VALUE_INT("SERVER_PORT_SECURE", s->is_ssl, 0);
   
   s->method   = lpEcb->lpszMethod;
  @@ -352,7 +352,7 @@
   unsigned num_of_vars = 0;
   
   for(i = 0 ; i < 9 ; i++) {
  -GET_SERVER_VARIABLE_VALUE(w->pool,ssl_env_names[i], ssl_env_values[i]);
  +GET_SERVER_VARIABLE_VALUE(w->mbean->pool,ssl_env_names[i], 
ssl_env_values[i]);
   if (ssl_env_values[i]) {
   num_of_vars++;
   }
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c

2002-04-27 Thread nacho 

nacho   02/04/27 17:23:42

  Modified:jk/native2/server/isapi jk_isapi_plugin.c jk_service_iis.c
  Log:
  * Some last bugs, correctly initalizing things, starting the response, and workerEnv 
correctly
  
  * It seems that isapi_redirector2.dll based on jk2 has started to exist at this 
point ;), briefly tested against tc33 old ajp13, and works nicely :)..
  
  Revision  ChangesPath
  1.11  +3 -9  
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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jk_isapi_plugin.c 27 Apr 2002 00:48:33 -  1.10
  +++ jk_isapi_plugin.c 28 Apr 2002 00:23:42 -  1.11
  @@ -60,7 +60,7 @@
* Author:  Gal Shachor <[EMAIL PROTECTED]>   *
* Author:  Larry Isaacs <[EMAIL PROTECTED]>   *
* Author:  Ignacio J. Ortega <[EMAIL PROTECTED]>   *
  - * Version: $Revision: 1.10 $   *
  + * Version: $Revision: 1.11 $   *
***/
   
   // This define is needed to include wincrypt,h, needed to get client certificates
  @@ -485,7 +485,7 @@
   rPool->reset(env, rPool);
   
   rc1=worker->rPoolCache->put( env, worker->rPoolCache, rPool );
  -
  +rc=HSE_STATUS_SUCCESS;
   lpEcb->dwHttpStatusCode = HTTP_STATUS_OK;
   env->l->jkLog(env, env->l,  JK_LOG_DEBUG, 
  "HttpExtensionProc service() returned OK\n");
  @@ -567,6 +567,7 @@
   env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using server root %s.\n", 
server_root);
   env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using worker file %s.\n", 
worker_file);
   env->l->jkLog(env, env->l,  JK_LOG_DEBUG, "Using uri select %d.\n", 
uri_select_option);
  +workerEnv->init(env,workerEnv);
   return rc;
   }
   
  @@ -787,13 +788,6 @@
   }
   
   env->l->jkLog(env, env->l, JK_LOG_ERROR, "JK2 Config Created");
  -
  -jkb = workerEnv->globalEnv->createBean2( workerEnv->globalEnv,
  - workerEnv->pool,
  - "uri", NULL );
  -newUri=jkb->object;
  
  -newUri->workerEnv=workerEnv;
  -
   return env;
   }
  
  
  
  1.12  +2 -5  
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- jk_service_iis.c  27 Apr 2002 00:48:33 -  1.11
  +++ jk_service_iis.c  28 Apr 2002 00:23:42 -  1.12
  @@ -98,10 +98,6 @@
   return JK_ERR;
   }
   
  -if (!s->response_started) {
  -return JK_OK;
  -}
  -
   if( lpEcb == NULL ) {
   env->l->jkLog(env,env->l, JK_LOG_ERROR, 
 "jk_ws_service_t::start_response, no lpEcp\n");
  @@ -320,6 +316,8 @@
   s->ssl_session  = NULL;
   s->ssl_key_size = -1;
   
  +jk2_map_default_create(env, &s->headers_out, s->pool );
  +jk2_map_default_create(env, &s->attributes, s->pool );
   jk2_map_default_create(env, &s->headers_in, s->pool );
   //s->headers_values   = NULL;
   //  s->num_headers  = 0;
  @@ -420,7 +418,6 @@
   
   cnt -= 2; /* For our two special headers */
   /* allocate an extra header slot in case we need to add a 
content-length header */
  -jk2_map_default_create(env, &s->headers_in, s->pool );
   for(i = 0, tmp = headers_buf ; *tmp && i < cnt ; ) {
   int real_header = JK_TRUE;
   char *headerName;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: