costin 01/11/16 22:00:24
Modified: jk/native build.xml
jk/native/common jk_jni_worker.c jk_lb_worker.c
jk_msg_buff.c
Log:
Few fixes for the previous commits.
Revision Changes Path
1.17 +2 -1 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 2001/11/16 22:52:43 1.16
+++ build.xml 2001/11/17 06:00:24 1.17
@@ -109,7 +109,8 @@
taskDebug="0"
profile="${so.profile}" >
<def name="_REENTRANT" />
- <def name="CHANNEL" />
+ <def name="CHANNEL"
+ if="use.channel"/>
<def name="CHUNK_SIZE" value="4096"
info="Read/Write buffer size" />
<def name="REUSE_WORKER"
1.6 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_jni_worker.c 2001/11/07 21:50:53 1.5
+++ jk_jni_worker.c 2001/11/17 06:00:24 1.6
@@ -59,7 +59,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
#if !defined(WIN32) && !defined(NETWARE)
@@ -557,12 +557,13 @@
}
if(p) {
- p->attached = JK_FALSE;
+ p->attached = JK_FALSE;
p->env = NULL;
p->worker = pThis->worker_private;
p->endpoint.endpoint_private = p;
p->endpoint.service = service;
p->endpoint.done = done;
+ p->endpoint.channelData = NULL;
*pend = &p->endpoint;
return JK_TRUE;
1.6 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jk_lb_worker.c 2001/11/07 21:50:53 1.5
+++ jk_lb_worker.c 2001/11/17 06:00:24 1.6
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Based on: *
- * Version: $Revision: 1.5 $ *
+ * Version: $Revision: 1.6 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -496,6 +496,7 @@
p->endpoint.endpoint_private = p;
p->endpoint.service = service;
p->endpoint.done = done;
+ p->endpoint.channelData = NULL;
*pend = &p->endpoint;
return JK_TRUE;
1.9 +1 -2 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_msg_buff.c 2001/11/07 21:40:59 1.8
+++ jk_msg_buff.c 2001/11/17 06:00:24 1.9
@@ -60,11 +60,10 @@
* Author: Costin <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
#include "jk_pool.h"
-#include "jk_connect.h"
#include "jk_util.h"
#include "jk_msg_buff.h"
#include "jk_logger.h"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
