You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by na...@locus.apache.org on 2000/11/19 05:15:14 UTC
cvs commit: jakarta-tomcat/src/native/mod_jk/nt_service jk_nt_service.c
nacho 00/11/18 20:15:14
Modified: src/native/mod_jk/nt_service jk_nt_service.c
Log:
Porting patches from tomcat_32
Revision Changes Path
1.2 +11 -3 jakarta-tomcat/src/native/mod_jk/nt_service/jk_nt_service.c
Index: jk_nt_service.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/mod_jk/nt_service/jk_nt_service.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_nt_service.c 2000/08/26 02:03:53 1.1
+++ jk_nt_service.c 2000/11/19 04:15:13 1.2
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: NT System service for Jakarta/Tomcat *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#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;
}
@@ -737,6 +737,10 @@
OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL,
NULL);
+ SetFilePointer(startupInfo.hStdOutput,
+ 0,
+ NULL,
+ FILE_END);
startupInfo.hStdError = CreateFile(data.stderr_file,
GENERIC_WRITE,
FILE_SHARE_READ,
@@ -744,6 +748,10 @@
OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL,
NULL);
+ SetFilePointer(startupInfo.hStdError,
+ 0,
+ NULL,
+ FILE_END);
memset(&processInformation, 0, sizeof(processInformation));