Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Date: 27 Apr 2005 06:15:00 -0000
Message-ID: <20050427061500.86334.qmail@minotaur.apache.org>
From: mturk@apache.org
To: jakarta-tomcat-connectors-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c

mturk       2005/04/26 23:15:00

  Modified:    jk/native/common jk_connect.c
  Log:
  Add SD_SEND for platforms that has no such define. Also lower the
  lingering timeout for graceful shutdown to 1 second and maximum of
  16x512 packets to consume, giving the AJP max packet size.
  
  Revision  Changes    Path
  1.55      +7 -5      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.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- jk_connect.c	24 Apr 2005 09:52:57 -0000	1.54
  +++ jk_connect.c	27 Apr 2005 06:14:59 -0000	1.55
  @@ -461,9 +461,12 @@
   }
   
   #ifndef MAX_SECS_TO_LINGER
  -#define MAX_SECS_TO_LINGER 30
  +#define MAX_SECS_TO_LINGER 16
  +#endif
  +#define SECONDS_TO_LINGER  1
  +#ifndef SD_SEND
  +#define DS_SEND 0x01
   #endif
  -#define SECONDS_TO_LINGER  2
   
   int jk_shutdown_socket(int s)
   {
  @@ -500,8 +503,7 @@
   #endif
       /* Read all data from the peer until we reach "end-of-file" (FIN
        * from peer) or we've exceeded our overall timeout. If the client does
  -     * not send us bytes within 2 seconds (a value pulled from Apache 1.3
  -     * which seems to work well), close the connection.
  +     * not send us bytes within12 second, close the connection.
        */
       while (1) {
           nbytes = jk_tcp_socket_recvfull(s, dummy, sizeof(dummy));
  
  
  

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