Index: jk_ajp_common.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.25
diff -u -3 -r1.25 jk_ajp_common.c
--- jk_ajp_common.c 10 May 2002 23:58:40 -0000  1.25
+++ jk_ajp_common.c 22 Jun 2002 15:50:16 -0000
@@ -584,10 +584,12 @@
     unsigned attempt;
 
     for(attempt = 0 ; attempt < ae->worker->connect_retry_attempts ; attempt++) {
-        ae->sd = jk_open_socket(&ae->worker->worker_inet_addr, JK_TRUE, l);
+        ae->sd = jk_open_socket(&ae->worker->worker_inet_addr, JK_TRUE, ae->worker->keepalive, l);
         if(ae->sd >= 0) {
             jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_connect_to_endpoint, connected sd = %d\n", ae->sd);
 
+             /* set last_access */
+             ae->last_access = time(NULL);
            /* Check if we must execute a logon after the physical connect */
            if (ae->worker->logon != NULL)
                return (ae->worker->logon(ae, l));
@@ -1232,21 +1234,29 @@
         cache = AJP13_DEF_CACHE_SZ;
     }
     else {
-        jk_log(l, JK_LOG_DEBUG, "In jk_worker_t::validate unknown protocol %d\n", proto);
+        jk_log(l, JK_LOG_DEBUG, "In jk_worker_t::init, unknown protocol %d\n", proto);
         return JK_FALSE;
     }
 
     if (pThis && pThis->worker_private) {
         ajp_worker_t *p = pThis->worker_private;
         int cache_sz = jk_get_worker_cache_size(props, p->name, cache);
-        
+        int socket_timeout = jk_get_worker_socket_timeout(props, p->name, AJP13_DEF_TIMEOUT);
+        int socket_keepalive = jk_get_worker_socket_keepalive(props, p->name, JK_FALSE);
+        int cache_timeout = jk_get_worker_cache_timeout(props, p->name, AJP_DEF_CACHE_TIMEOUT);
+
+        jk_log(l, JK_LOG_DEBUG, "In jk_worker_t::init, setting socket timeout to %d\n", socket_timeout);
+        p->socket_timeout = socket_timeout;
+        p->keepalive = socket_keepalive;
+        p->cache_timeout = cache_timeout;
         /* 
          *  Need to initialize secret here since we could return from inside
          *  of the following loop
          */
            
         p->secret = jk_get_worker_secret(props, p->name );
-
+       p->ep_cache_sz = 0;
+       p->ep_mincache_sz = 0;
         if (cache_sz > 0) {
             p->ep_cache = (ajp_endpoint_t **)malloc(sizeof(ajp_endpoint_t *) * cache_sz);
             if(p->ep_cache) {
@@ -1305,6 +1315,23 @@
     return JK_FALSE;
 }
 
+static ajp_endpoint_t **extend_cache(ajp_endpoint_t **cache, 
+                                    unsigned orgsize, unsigned newsize)
+{
+   ajp_endpoint_t **rv;
+    rv = (ajp_endpoint_t **)malloc(sizeof(ajp_endpoint_t *) * newsize);
+    if(rv) {
+       unsigned i;
+       for (i = 0; i < newsize; i++) {
+           if (i < orgsize)
+               rv[i] = cache[i];
+           else
+               rv[i] = NULL;
+       }
+   }
+   return rv;
+}
+
 int JK_METHOD ajp_done(jk_endpoint_t **e,
                        jk_logger_t    *l)
 {
@@ -1328,10 +1355,10 @@
                             break;
                         }
                     }
-                    JK_LEAVE_CS(&w->cs, rc);
+                   JK_LEAVE_CS(&w->cs, rc);
                     if(i < w->ep_cache_sz) {
-                            jk_log(l, JK_LOG_DEBUG, "Into jk_endpoint_t::done, recycling connection\n");
-                            return JK_TRUE;
+                        jk_log(l, JK_LOG_DEBUG, "Into jk_endpoint_t::done, recycling connection\n");
+                        return JK_TRUE;
                     }
                 }
             }
@@ -1363,6 +1390,7 @@
             JK_ENTER_CS(&aw->cs, rc);
             if (rc) {
                 unsigned i;
+                time_t now = time(NULL);
     
                 for (i = 0 ; i < aw->ep_cache_sz ; i++) {
                     if (aw->ep_cache[i]) {
@@ -1371,8 +1399,30 @@
                         break;
                     }
                 }
+               /* Handle enpoint cache timeouts */
+                for ( ; i < aw->ep_cache_sz ; i++) {
+                    if (aw->ep_cache[i]) {
+                       unsigned elapsed = abs((int)difftime(now, ae->last_access));
+                       if (elapsed > aw->cache_timeout) {
+                           jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_get_endpoint, cleaning cache slot = %d elapsed %d\n", i, elapsed);
+                           ajp_close_endpoint(aw->ep_cache[i], l);
+                           aw->ep_cache[i] = NULL;
+                       }
+                    }
+                }
                 JK_LEAVE_CS(&aw->cs, rc);
                 if (ae) {
+                  if (ae->sd > 0) {
+                    /* Handle timeouts for open sockets */
+                    unsigned elapsed = abs((int)difftime(now, ae->last_access));
+                    ae->last_access = now;
+                    jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_get_endpoint, time elapsed since last request = %d seconds\n", elapsed);
+                    if (aw->socket_timeout > 0 && elapsed > aw->socket_timeout) {
+                      jk_close_socket(ae->sd);
+                      jk_log(l, JK_LOG_DEBUG, "In jk_endpoint_t::ajp_get_endpoint, reached socket timeout, closed sd = %d\n", ae->sd);
+                      ae->sd = -1; /* just to avoid twice close */
+                    }
+                  }
                     *je = &ae->endpoint;
                     return JK_TRUE;
                 }
@@ -1383,6 +1433,7 @@
         if (ae) {
             ae->sd = -1;
             ae->reuse = JK_FALSE;
+            ae->last_access = time(NULL);
             jk_open_pool(&ae->pool, ae->buf, sizeof(ae->buf));
             ae->worker = pThis->worker_private;
             ae->endpoint.endpoint_private = ae;

