You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2002/06/25 09:07:31 UTC

cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.h

mturk       2002/06/25 00:07:31

  Modified:    jk/native/common jk_ajp_common.h
  Log:
  Introduced socket and cache timeout.
  By Jan Singer, Henri Gomez and Mladen Turk.
  
  Revision  Changes    Path
  1.15      +22 -4     jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h
  
  Index: jk_ajp_common.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_ajp_common.h	6 Feb 2002 19:11:23 -0000	1.14
  +++ jk_ajp_common.h	25 Jun 2002 07:07:31 -0000	1.15
  @@ -87,7 +87,7 @@
   #define SC_A_SSL_CIPHER         (unsigned char)8
   #define SC_A_SSL_SESSION        (unsigned char)9
   #define SC_A_REQ_ATTRIBUTE      (unsigned char)10
  -#define SC_A_SSL_KEY_SIZE       (unsigned char)11		/* only in if JkOptions +ForwardKeySize */
  +#define SC_A_SSL_KEY_SIZE       (unsigned char)11       /* only in if JkOptions +ForwardKeySize */
   #define SC_A_SECRET             (unsigned char)12
   #define SC_A_ARE_DONE           (unsigned char)0xFF
   
  @@ -132,7 +132,7 @@
   #define SC_M_MOVE               (unsigned char)12
   #define SC_M_LOCK               (unsigned char)13
   #define SC_M_UNLOCK             (unsigned char)14
  -#define SC_M_ACL		(unsigned char)15
  +#define SC_M_ACL        (unsigned char)15
   #define SC_M_REPORT             (unsigned char)16
   #define SC_M_VERSION_CONTROL    (unsigned char)17
   #define SC_M_CHECKIN            (unsigned char)18
  @@ -216,6 +216,7 @@
   #define AJP_HEADER_LEN            (4)
   #define AJP_HEADER_SZ_LEN         (2)
   #define CHUNK_BUFFER_PAD          (12)
  +#define AJP_DEF_CACHE_TIMEOUT     (15)
   
   
   struct jk_res_data {
  @@ -252,6 +253,8 @@
        */
       JK_CRIT_SEC cs;
       unsigned ep_cache_sz;
  +    unsigned ep_mincache_sz;
  +    unsigned ep_maxcache_sz;
       ajp_endpoint_t **ep_cache;
   
       int proto; /* PROTOCOL USED AJP13/AJP14 */
  @@ -269,6 +272,16 @@
        */ 
       int (* logon)(ajp_endpoint_t *ae,
                     jk_logger_t    *l);
  +
  +    /*
  +    * Handle Socket Timeouts
  +    */
  +    unsigned socket_timeout;
  +    unsigned keepalive;
  +    /*
  +    * Handle Cache Timeouts
  +    */
  +    unsigned cache_timeout;
   }; 
    
   
  @@ -281,13 +294,18 @@
       jk_pool_t pool;
       jk_pool_atom_t buf[BIG_POOL_SIZE];
   
  -	int proto;	/* PROTOCOL USED AJP13/AJP14 */
  +    int proto;  /* PROTOCOL USED AJP13/AJP14 */
   
       int sd;
       int reuse;
       jk_endpoint_t endpoint;
   
       unsigned left_bytes_to_send;
  +
  +    /* time of the last request
  +       handled by this endpoint */
  +    time_t last_access;
  +
   };
   
   /*
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>