tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_worker_ajp13.c
Date Mon, 23 Feb 2004 13:57:27 GMT
hgomez      2004/02/23 05:57:27

  Modified:    jk/native2 CHANGES.txt
               jk/native2/include jk_worker.h
               jk/native2/common jk_worker_ajp13.c
  Log:
  Initial port of recovery_opts (from jk)
  
  Revision  Changes    Path
  1.12      +2 -2      jakarta-tomcat-connectors/jk/native2/CHANGES.txt
  
  Index: CHANGES.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/CHANGES.txt,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CHANGES.txt	16 Feb 2004 08:50:18 -0000	1.11
  +++ CHANGES.txt	23 Feb 2004 13:57:27 -0000	1.12
  @@ -10,7 +10,7 @@
       * Make use apr_port_t instead of short to fix problem to have port higher than 32K.
       * Make default port configurable (9009 on Netware, 8009 elsewhere)
       * Fix problem when in Load-Balancing and POST [Henri Gomez].
  -    
  +    * Add recovery_opts (recovery strategy) which help make POST recovery configurable
[Henri Gomez].
   Changes with JK2 2.0.4:
       * Added the load balancer stickySession property. If set to 0
         requests with servlet SESSION ID's can be routed to any Tomcat
  
  
  
  1.33      +6 -1      jakarta-tomcat-connectors/jk/native2/include/jk_worker.h
  
  Index: jk_worker.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_worker.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- jk_worker.h	16 Oct 2003 07:51:48 -0000	1.32
  +++ jk_worker.h	23 Feb 2004 13:57:27 -0000	1.33
  @@ -228,6 +228,11 @@
        */
       int reply_timeout;
       
  +	/*
  +	 * Recovery option
  +	 */
  +	int recovery_opts;		/* Set the recovery option */
  +
       /** Delay in ms for Tomcat to respond to a PING request before 
        *  webserver start sending the request (ensure that Tomcat is not HOLDED)
        */
  
  
  
  1.56      +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.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- jk_worker_ajp13.c	16 Feb 2004 08:34:09 -0000	1.55
  +++ jk_worker_ajp13.c	23 Feb 2004 13:57:27 -0000	1.56
  @@ -123,6 +123,8 @@
           return jk2_env_itoa( env, worker->reply_timeout);
       } else if (strcmp( name, "prepostTimeout" )==0 ) {
           return jk2_env_itoa( env, worker->prepost_timeout);
  +    } else if (strcmp( name, "recovery_opts" )==0 ) {
  +        return jk2_env_itoa( env, worker->recovery_opts);
       } else if (strcmp( name, "disabled" )==0 ) {
           return jk2_env_itoa( env, bean->disabled );
       } else if (strcmp( name, "epCount" )==0 ) {
  @@ -160,6 +162,8 @@
           ajp13->reply_timeout=atoi( value );
       } else if( strcmp( name, "prepostTimeout" )==0 ) {
           ajp13->prepost_timeout=atoi( value );
  +    } else if( strcmp( name, "recovery_opts" )==0 ) {
  +        ajp13->recovery_opts=atoi( value );
       } else if( strcmp( name, "disabled" )==0 ) {
           mbean->disabled=atoi( value );
       } else if( strcmp( name, "group" )==0 ) {
  
  
  

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


Mime
View raw message