costin 02/05/26 00:31:12
Modified: jk/native2/include jk_channel.h jk_workerEnv.h
Log:
Remove the duplicated init method in channel.
The AJP13 callback ( used in JNI mode ) that was supposed to be use
by the unix channel should work with all channels.
Revision Changes Path
1.12 +0 -10 jakarta-tomcat-connectors/jk/native2/include/jk_channel.h
Index: jk_channel.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_channel.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_channel.h 16 May 2002 20:49:53 -0000 1.11
+++ jk_channel.h 26 May 2002 07:31:12 -0000 1.12
@@ -118,16 +118,6 @@
struct jk_worker *worker;
char *workerName;
- /** Prepare the channel, check the properties. This
- * will resolve the host and do all the validations.
- * ( needed to remove the dependencies on sockets in ajp)
- *
- * The channel may save or use data from the worker ( like cache
- * the inet addr, etc )
- * XXX revisit this - we may pass too much that is not needed
- */
- int (JK_METHOD *init)(struct jk_env *env, jk_channel_t *_this);
-
/** Open the communication channel
*/
int (JK_METHOD *open)(struct jk_env *env, jk_channel_t *_this,
1.24 +4 -4 jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h
Index: jk_workerEnv.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_workerEnv.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jk_workerEnv.h 24 May 2002 04:35:17 -0000 1.23
+++ jk_workerEnv.h 26 May 2002 07:31:12 -0000 1.24
@@ -58,7 +58,7 @@
/***************************************************************************
* Description: Workers controller header file *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.23 $ *
+ * Version: $Revision: 1.24 $ *
***************************************************************************/
#ifndef JK_WORKERENV_H
@@ -115,14 +115,14 @@
/* Login Rejected (servlet engine -> web server) */
#define JK_HANDLE_LOGON_ERR 0x14
-/* Dispatcher for jni channel ( JNI -> web server ) */
+/* Dispatcher for jni channel ( java->C ) */
#define JK_HANDLE_JNI_DISPATCH 0x15
/* Dispatcher for shm object ( java->C) */
#define JK_HANDLE_SHM_DISPATCH 0x16
-/* Dispatcher for unix socket channel ( java->C )*/
-#define JK_HANDLE_UN_DISPATCH 0x17
+/* Dispatcher for channel components ( java->C )*/
+#define JK_HANDLE_CH_DISPATCH 0x17
/* Dispatcher for mutex object ( java->C ) */
#define JK_HANDLE_MUTEX_DISPATCH 0x18
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
