hgomez 01/06/07 07:09:14
Modified: jk/src/native/netscape Makefile.nw Makefile.solaris
jk_nsapi_plugin.c nsapi.dsp
Log:
updated build files to use :
jk_ajp14, jk_ajp14_worker, jk_md5, jk_ajp_common
Revision Changes Path
1.4 +4 -0 jakarta-tomcat-connectors/jk/src/native/netscape/Makefile.nw
Index: Makefile.nw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/netscape/Makefile.nw,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.nw 2001/05/18 20:53:23 1.3
+++ Makefile.nw 2001/06/07 14:08:58 1.4
@@ -33,7 +33,11 @@
JK_OBJS=\
jk_ajp12_worker.obj \
jk_ajp13_worker.obj \
+ jk_ajp14_worker.obj \
jk_ajp13.obj \
+ jk_ajp14.obj \
+ jk_ajp_common.obj \
+ jk_md5.obj \
jk_connect.obj \
jk_jni_worker.obj \
jk_lb_worker.obj \
1.3 +1 -1
jakarta-tomcat-connectors/jk/src/native/netscape/Makefile.solaris
Index: Makefile.solaris
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/src/native/netscape/Makefile.solaris,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.solaris 2001/05/18 14:55:08 1.2
+++ Makefile.solaris 2001/06/07 14:09:00 1.3
@@ -12,7 +12,7 @@
JK_OBJS = jk_ajp12_worker.o jk_lb_worker.o jk_sockbuf.o jk_connect.o jk_map.o \
jk_uri_worker_map.o jk_nsapi_plugin.o jk_util.o jk_jni_worker.o \
-jk_pool.o jk_worker.o jk_ajp14.o jk_ajp14_worker.o jk_md5.o
+jk_pool.o jk_worker.o jk_ajp14.o jk_ajp14_worker.o jk_md5.o jk_ajp_common.o
INCLUDE_FLAGS=-I$(INCLUDEDIR) -I$(INCLUDEDIR)/base -I$(INCLUDEDIR)/frame
-I$(JAVA_INCLUDE) -I$(JAVA_INCLUDE)/$(OS_TYPE)
COMMON_DEFS=-DMCC_HTTPD -DXP_UNIX -DSPAPI20 -DSOLARIS -Wall
1.2 +4 -2
jakarta-tomcat-connectors/jk/src/native/netscape/jk_nsapi_plugin.c
Index: jk_nsapi_plugin.c
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/src/native/netscape/jk_nsapi_plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_nsapi_plugin.c 2001/05/14 09:52:08 1.1
+++ jk_nsapi_plugin.c 2001/06/07 14:09:02 1.2
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: NSAPI plugin for Netscape servers *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
@@ -123,7 +123,9 @@
static void init_workers_on_other_threads(void *init_d)
{
jk_map_t *init_map = (jk_map_t *)init_d;
- if(wc_open(init_map, logger)) {
+ /* we add the URI->WORKER MAP since workers using AJP14 will feed it */
+ /* but where are they here in Netscape ? */
+ if(wc_open(init_map, NULL, logger)) {
init_on_other_thread_is_ok = JK_TRUE;
} else {
jk_log(logger, JK_LOG_EMERG, "In init_workers_on_other_threads, failed\n");
1.2 +34 -0 jakarta-tomcat-connectors/jk/src/native/netscape/nsapi.dsp
Index: nsapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/netscape/nsapi.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsapi.dsp 2001/05/14 09:52:35 1.1
+++ nsapi.dsp 2001/06/07 14:09:04 1.2
@@ -147,6 +147,23 @@
SOURCE=..\common\jk_worker.c
# End Source File
# End Group
+
+SOURCE=..\common\jk_ajp14.c
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_ajp14_worker.c
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_md5.c
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_ajp_common.c
+# End Source File
+# End Group
+
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
@@ -223,6 +240,23 @@
SOURCE=..\common\jk_worker_list.h
# End Source File
# End Group
+
+SOURCE=..\common\jk_ajp14.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_worker_ajp14.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_md5.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_ajp_common.h
+# End Source File
+# End Group
+
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
