tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c jk_connect.c jk_connect.h
Date Thu, 21 Apr 2005 11:36:29 GMT
mturk       2005/04/21 04:36:29

  Modified:    jk/native/common jk_ajp_common.c jk_connect.c jk_connect.h
  Log:
  Remove unused timeout parameter for testing if socket is connected.
  
  Revision  Changes    Path
  1.98      +3 -3      jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
  
  Index: jk_ajp_common.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -r1.97 -r1.98
  --- jk_ajp_common.c	21 Apr 2005 11:18:44 -0000	1.97
  +++ jk_ajp_common.c	21 Apr 2005 11:36:29 -0000	1.98
  @@ -847,7 +847,7 @@
               if (ae->worker->cache_timeout > 0 || ae->worker->recycle_timeout
> 0)
                   ae->last_access = time(NULL);
               if (ae->worker->socket_timeout > 0) {
  -                if (!jk_is_socket_connected(ae->sd, ae->worker->socket_timeout))
{
  +                if (!jk_is_socket_connected(ae->sd)) {
                       jk_log(l, JK_LOG_INFO,
                              "Socket is not connected any more (errno=%d)", errno);
                       jk_close_socket(ae->sd);
  @@ -1160,7 +1160,7 @@
       while ((ae->sd > 0)) {
           err = 0;
           if (ae->worker->socket_timeout) {
  -            if (!jk_is_socket_connected(ae->sd, ae->worker->socket_timeout)) {
  +            if (!jk_is_socket_connected(ae->sd)) {
                   jk_log(l, JK_LOG_INFO,
                          "Socket is not connected any more (errno=%d)", errno);
                   jk_close_socket(ae->sd);
  
  
  
  1.53      +2 -8      jakarta-tomcat-connectors/jk/native/common/jk_connect.c
  
  Index: jk_connect.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- jk_connect.c	13 Apr 2005 11:12:38 -0000	1.52
  +++ jk_connect.c	21 Apr 2005 11:36:29 -0000	1.53
  @@ -548,18 +548,12 @@
       return buf;
   }
   
  -int jk_is_socket_connected(int sd, int timeout)
  +int jk_is_socket_connected(int sd)
   {
       fd_set fd;
       struct timeval tv;
       int rc;
       
  -    /* socket_timeout is unused in select implemention
  -     * If we change this to non blocking read, then we
  -     * will use the timeout parameter.
  -     */
  -     timeout = 0;
  -     
       FD_ZERO(&fd);
       FD_SET(sd, &fd);
   
  
  
  
  1.14      +2 -2      jakarta-tomcat-connectors/jk/native/common/jk_connect.h
  
  Index: jk_connect.h
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- jk_connect.h	17 Feb 2005 07:09:27 -0000	1.13
  +++ jk_connect.h	21 Apr 2005 11:36:29 -0000	1.14
  @@ -51,7 +51,7 @@
   
   char *jk_dump_hinfo(struct sockaddr_in *saddr, char *buf);
   
  -int jk_is_socket_connected(int sd, int timeout);
  +int jk_is_socket_connected(int sd);
   
   #ifdef __cplusplus
   }
  
  
  

---------------------------------------------------------------------
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