hgomez 2003/07/24 01:17:26
Modified: jk/native/nt_service jk_nt_service.c
Log:
port is now integer
Revision Changes Path
1.8 +18 -18 jakarta-tomcat-connectors/jk/native/nt_service/jk_nt_service.c
Index: jk_nt_service.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/nt_service/jk_nt_service.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_nt_service.c 8 Aug 2002 18:15:44 -0000 1.7
+++ jk_nt_service.c 24 Jul 2003 08:17:24 -0000 1.8
@@ -86,8 +86,8 @@
static HANDLE hServerStopEvent = NULL;
static int shutdown_port;
static char *shutdown_protocol = AJP12_TAG;
-static char *shutdown_secret = NULL;
-static char *shutdown_cmd=NULL;
+static char *shutdown_secret = NULL;
+static char *shutdown_cmd=NULL;
typedef enum ActionEnum
{ acNoAction = 0,
@@ -156,11 +156,11 @@
char *b, DWORD sz);
static int start_tomcat(const char *name,
HANDLE *hTomcat);
-static void stop_tomcat(char *name,
- short port,
- const char *protocol,
- char *secret,
- HANDLE hTomcat);
+static void stop_tomcat(char *name,
+ int port,
+ const char *protocol,
+ char *secret,
+ HANDLE hTomcat);
static int read_startup_data(jk_map_t *init_map,
jk_tomcat_startup_data_t *data,
jk_pool_t *p);
@@ -756,8 +756,8 @@
char szNameBuff[256];
DWORD lenNameBuff = 256;
char *szTrueName = name;
- SC_HANDLE schSCManager;
- int rc;
+ SC_HANDLE schSCManager;
+ int rc;
schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS );
if(schSCManager) {
@@ -781,7 +781,7 @@
* Stop order arrived
*/
ResetEvent(hServerStopEvent);
- stop_tomcat(name, (short)shutdown_port, shutdown_protocol,
+ stop_tomcat(name, shutdown_port, shutdown_protocol,
shutdown_secret, hTomcat);
break;
case (WAIT_OBJECT_0 + 1):
@@ -799,7 +799,7 @@
* some error...
* close the servlet container and exit
*/
- stop_tomcat(name, (short)shutdown_port, shutdown_protocol,
+ stop_tomcat(name, shutdown_port, shutdown_protocol,
shutdown_secret, hTomcat);
}
CloseHandle(hServerStopEvent);
@@ -897,7 +897,7 @@
}
static void stop_tomcat(char *name,
- short port,
+ int port,
const char *protocol,
char *secret,
HANDLE hTomcat)
@@ -1040,9 +1040,9 @@
FILE_END);
memset(&processInformation, 0, sizeof(processInformation));
-
- if( cmdLine==NULL )
- cmdLine=data.cmd_line;
+
+ if( cmdLine==NULL )
+ cmdLine=data.cmd_line;
printf(cmdLine);
if(CreateProcess(data.java_bin,
@@ -1063,8 +1063,8 @@
shutdown_port = data.shutdown_port;
shutdown_secret = data.shutdown_secret;
- shutdown_protocol = strdup(data.shutdown_protocol);
- shutdown_cmd =
strdup(data.stop_cmd);
+ shutdown_protocol = strdup(data.shutdown_protocol);
+ shutdown_cmd =
strdup(data.stop_cmd);
return JK_TRUE;
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
