You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2003/03/05 00:55:35 UTC

cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_channel_socket.c

costin      2003/03/04 15:55:35

  Modified:    jk/native2/common jk_channel_socket.c
  Log:
  Add graceful to channel - it's easier to config.
  
  Revision  Changes    Path
  1.50      +5 -3      jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c
  
  Index: jk_channel_socket.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- jk_channel_socket.c	1 Mar 2003 05:49:58 -0000	1.49
  +++ jk_channel_socket.c	4 Mar 2003 23:55:35 -0000	1.50
  @@ -113,9 +113,9 @@
   static int JK_METHOD jk2_channel_socket_close(jk_env_t *env, jk_channel_t *ch,
                                                jk_endpoint_t *endpoint);
   
  -static char *jk2_channel_socket_getAttributeInfo[]={"host", "port", "keepalive", "timeout", "nodelay",
  +static char *jk2_channel_socket_getAttributeInfo[]={"host", "port", "keepalive", "timeout", "nodelay", "graceful",
                                                       "debug", "disabled", NULL };
  -static char *jk2_channel_socket_setAttributeInfo[]={"host", "port", "keepalive", "timeout", "nodelay",
  +static char *jk2_channel_socket_setAttributeInfo[]={"host", "port", "keepalive", "timeout", "nodelay", "graceful",
                                                       "debug", "disabled", NULL };
   
   static int JK_METHOD jk2_channel_socket_setAttribute(jk_env_t *env,
  @@ -162,6 +162,8 @@
           return jk2_env_itoa( env, socketInfo->keepalive );
       } else if( strcmp( "timeout", name ) == 0 ) {
           return jk2_env_itoa( env, socketInfo->timeout );
  +    } else if( strcmp( "graceful", name ) == 0 ) {
  +        return jk2_env_itoa( env, ch->worker->graceful );
       } else if( strcmp( "debug", name ) == 0 ) {
           return jk2_env_itoa( env, ch->mbean->debug );
       } else if( strcmp( "disabled", name ) == 0 ) {
  @@ -311,7 +313,7 @@
   
       int sock;
       int ret;
  -    
  +
       sock = socket(AF_INET, SOCK_STREAM, 0);
       if(sock < 0) {
   #ifdef WIN32
  
  
  

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