costin 01/11/16 14:59:06
Modified: jk/native/common jk_worker.c jk_registry.c jk_ajp14_worker.c
jk_ajp13_worker.c
Log:
Minor changes ( remove unused imports, add socket channel to the registry )
Revision Changes Path
1.9 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_worker.c 2001/11/05 23:22:05 1.8
+++ jk_worker.c 2001/11/16 22:59:06 1.9
@@ -60,7 +60,7 @@
* Description: Workers controller *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.8 $ *
+ * Version: $Revision: 1.9 $ *
***************************************************************************/
/* #define _PLACE_WORKER_LIST_HERE */
@@ -113,7 +113,7 @@
we->num_of_workers=num_of_workers;
we->first_worker=worker_list[0];
- jk_log(l, JK_LOG_DEBUG, "wc_open, done %d\n", num_of_workers);
+ jk_log(l, JK_LOG_DEBUG, "wc_open, done %d %s\n", num_of_workers,
worker_list[0]);
return JK_TRUE;
}
1.5 +11 -1 jakarta-tomcat-connectors/jk/native/common/jk_registry.c
Index: jk_registry.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_registry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_registry.c 2001/11/11 01:17:43 1.4
+++ jk_registry.c 2001/11/16 22:59:06 1.5
@@ -62,7 +62,7 @@
/***************************************************************************
* Description: Worker list *
- * Version: $Revision: 1.4 $ *
+ * Version: $Revision: 1.5 $ *
***************************************************************************/
/** Static declarations for all 'hardcoded' modules. This is a hack,
@@ -102,6 +102,13 @@
jk_logger_t *l);
#endif
+/* Factories for 'new' types. We use the new factory interface,
+ * workers will be updated later
+ */
+int JK_METHOD jk_channel_socket_factory(jk_env_t *env, void **result,
+ char *type, char *name);
+
+
/**
* Init the components that we compile in by default.
* In future we should have a more flexible mechanism that would allow
@@ -122,6 +129,9 @@
#ifdef HAVE_JNI
env->registerFactory( env, "worker", "jni", (void *)&jni_worker_factory );
#endif
+
+ env->registerFactory( env, "channel", "socket",
+ (void *)&jk_channel_socket_factory );
/*
env->registerFactory( env, "channel", "socket", &jk_channel_socket_factory );
1.13 +1 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_ajp14_worker.c 2001/11/07 21:50:53 1.12
+++ jk_ajp14_worker.c 2001/11/16 22:59:06 1.13
@@ -58,12 +58,11 @@
/***************************************************************************
* Description: AJP14 next generation Bi-directional protocol. *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.12 $ *
+ * Version: $Revision: 1.13 $ *
***************************************************************************/
#include "jk_context.h"
#include "jk_pool.h"
-#include "jk_connect.h"
#include "jk_util.h"
#include "jk_msg_buff.h"
#include "jk_ajp13.h"
1.8 +1 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_ajp13_worker.c 2001/11/07 21:50:53 1.7
+++ jk_ajp13_worker.c 2001/11/16 22:59:06 1.8
@@ -60,11 +60,10 @@
* Author: Costin <[EMAIL PROTECTED]> *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***************************************************************************/
#include "jk_pool.h"
-#include "jk_connect.h"
#include "jk_util.h"
#include "jk_msg_buff.h"
#include "jk_ajp_common.h"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
