Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: tomcat-dev@jakarta.apache.org
Message-ID: <361024C34A6DD2118689006097AE2B4D0102CCC6@css4.cs>
From: GOMEZ Henri <hgomez@slib.fr>
To: tomcat-dev@jakarta.apache.org
Subject: RE: [Patch] Tomcat 3.2.2
Date: Tue, 24 Apr 2001 23:18:10 +0200
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"

Commited to 3.3 branch.

What about 3.2 branch Marc ?

-
Henri Gomez                 ___[_]____
EMAIL : hgomez@slib.fr        (. .)                     
PGP KEY : 697ECEDD    ...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 


>-----Original Message-----
>From: William A. Rowe, Jr. [mailto:wrowe@covalent.net]
>Sent: Tuesday, April 24, 2001 6:47 AM
>To: tomcat-dev@jakarta.apache.org
>Subject: [Patch] Tomcat 3.2.2
>
>
>Gentlefolk,
>
>  on the Apache side we ran into a headache on Win2K.  Windows 
>services introduced
>a SHUTDOWN event with a new signal.  Unfortuantely, they did 
>_not_ continue to
>support the STOP event from NT.  This patch teaches the 
>jk_nt_service to solicit
>and respect the SHUTDOWN event as well as the old STOP event.
>
>Your,
>
>Bill
>
>Index: src/native/mod_jk/nt_service/jk_nt_service.c
>===================================================================
>RCS file: 
>/home/cvspublic/jakarta-tomcat/src/native/mod_jk/nt_service/jk_
>nt_service.c,v
>retrieving revision 1.2
>diff -u -r1.2 jk_nt_service.c
>--- src/native/mod_jk/nt_service/jk_nt_service.c 2000/11/19 
>04:15:13 1.2
>+++ src/native/mod_jk/nt_service/jk_nt_service.c 2001/04/24 04:33:25
>@@ -248,6 +248,7 @@
>         /*
>          * Stop the service.
>          */
>+        case SERVICE_CONTROL_SHUTDOWN:
>         case SERVICE_CONTROL_STOP:
>             ssStatus.dwCurrentState = SERVICE_STOP_PENDING;
>             stop_jk_service();
>@@ -281,7 +282,8 @@
>     if(dwCurrentState == SERVICE_START_PENDING) {
>         ssStatus.dwControlsAccepted = 0;
>     } else {
>-        ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
>+        ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP 
>+                                    | SERVICE_ACCEPT_SHUTDOWN;
>     }
> 
>     ssStatus.dwCurrentState = dwCurrentState;
>
>