tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/native/nt_service jk_nt_service.c
Date Sat, 04 Nov 2000 22:48:43 GMT
craigmcc    00/11/04 14:48:43

  Modified:    src/native/nt_service Tag: tomcat_32 jk_nt_service.c
  Log:
  Patch the NT Service tool to fix bugs when shutting down Tomcat via the
  AJP12 protocol, which causes Tomcat to be shutdown with extreme prejudice
  instead of waiting for it to shut down via the ajp12 shutdown message.
  
  NOTE:  I HAVE NO MECHANISM FOR TESTING THIS PATCH - PLEASE CHECK IT OUT
  
  Submitted by: Brett Bergquist <bbergquist@snet.net>,
    on TOMCAT-DEV, 31-Oct-2000
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +3 -3      jakarta-tomcat/src/native/nt_service/Attic/jk_nt_service.c
  
  Index: jk_nt_service.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/native/nt_service/Attic/jk_nt_service.c,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- jk_nt_service.c	2000/06/12 09:48:59	1.3
  +++ jk_nt_service.c	2000/11/04 22:48:42	1.3.2.1
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: NT System service for Jakarta/Tomcat                       *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  - * Version:     $Revision: 1.3 $                                           *
  + * Version:     $Revision: 1.3.2.1 $                                           *
    ***************************************************************************/
   
   #include "jk_global.h"
  @@ -670,13 +670,13 @@
                   }                                                    
               } else {
                   char b[] = {(char)254, (char)15};
  -                int rc = send(sd, b, 2, 0);
  +                rc = send(sd, b, 2, 0);
                   if(2 == rc) {
                       rc = JK_TRUE;
                   }
               }
               jk_close_socket(sd);
  -            if(2 == rc) {
  +            if(JK_TRUE == rc) {
                   if(WAIT_OBJECT_0 == WaitForSingleObject(hTomcat, 30*1000)) {
                       return;
                   }
  
  
  

Mime
View raw message