This has to be one of the most convincing reasons I can think of to exclude
j-t-c/jk/native(2) from the source distro ;-).
----- Original Message -----
From: "Thuy-Linh Chu" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Tuesday, December 07, 2004 2:58 PM
Subject: [PATCH] Fix for shutdown in jk_nt_service.c
> Version patch: 5.0.29
> File patched:
>
jakarta-tomcat-5.0.29-src/jakarta-tomcat-connectors/jk/native/nt_service/jk_
> nt_service.c\
> Patch content is below and also in the attached file:
>
>
> --- jk_nt_service.c 2004-10-05 14:30:48.000000000 -0700
> +++ jk_nt_service.c.new 2004-12-07 14:41:01.500000000 -0800
> @@ -119,7 +119,9 @@
> int port,
> const char *protocol,
> char *secret,
> - HANDLE hTomcat);
> + HANDLE *hTomcat,
> + char *shutdown_cmd);
> +
> static int read_startup_data(jk_map_t *init_map,
> jk_tomcat_startup_data_t *data,
> jk_pool_t *p);
> @@ -694,6 +696,7 @@
> /*
> * report the status to the service control manager.
> */
> +
> if(ReportStatusToSCMgr(SERVICE_START_PENDING, // service state
> NO_ERROR, // exit code
> 3000)) { // wait hint
> @@ -741,7 +744,7 @@
> */
> ResetEvent(hServerStopEvent);
> stop_tomcat(name, shutdown_port,
shutdown_protocol,
> - shutdown_secret, hTomcat);
> + shutdown_secret, &hTomcat,
> shutdown_cmd);
> break;
> case (WAIT_OBJECT_0 + 1):
> /*
> @@ -759,7 +762,7 @@
> * close the servlet container and exit
> */
> stop_tomcat(name, shutdown_port,
shutdown_protocol,
> - shutdown_secret, hTomcat);
> + shutdown_secret, &hTomcat,
> shutdown_cmd);
> }
> CloseHandle(hServerStopEvent);
> CloseHandle(hTomcat);
> @@ -859,7 +862,8 @@
> int port,
> const char *protocol,
> char *secret,
> - HANDLE hTomcat)
> + HANDLE *hTomcat,
> + char *shutdown_cmd)
> {
> struct sockaddr_in in;
>
> @@ -905,7 +909,7 @@
> rc = jk_b_append_string(msg, secret);
> }
> if(rc) {
> - jk_b_end(msg, AJP13_PROTO);
> + jk_b_end(msg, AJP13_WS_HEADER);
>
> if(0 > jk_tcp_socket_sendfull(sd,
> jk_b_get_buff(msg),
>
>
----------------------------------------------------------------------------
----
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
This message is intended only for the use of the person(s) listed above as the
intended recipient(s), and may contain information that is PRIVILEGED and
CONFIDENTIAL. If you are not an intended recipient, you may not read, copy, or
distribute this message or any attachment. If you received this communication
in error, please notify us immediately by e-mail and then delete all copies of
this message and any attachments.
In addition you should be aware that ordinary (unencrypted) e-mail sent through
the Internet is not secure. Do not send confidential or sensitive information,
such as social security numbers, account numbers, personal identification
numbers and passwords, to us via ordinary (unencrypted) e-mail.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
