You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2001/06/07 16:13:19 UTC
cvs commit: jakarta-tomcat-connectors/jk/src/native/iis isapi.dsp jk_isapi_plugin.c
hgomez 01/06/07 07:13:19
Modified: jk/src/native/iis isapi.dsp jk_isapi_plugin.c
Log:
Updated build file (jk_ajp_common)
Updated use of wc_open
Revision Changes Path
1.3 +19 -7 jakarta-tomcat-connectors/jk/src/native/iis/isapi.dsp
Index: isapi.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/iis/isapi.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- isapi.dsp 2001/05/18 14:52:17 1.2
+++ isapi.dsp 2001/06/07 14:13:09 1.3
@@ -164,6 +164,14 @@
# End Source File
# End Group
+SOURCE=..\common\jk_context.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"
@@ -173,15 +181,11 @@
# End Source File
# Begin Source File
-SOURCE=..\common\jk_ajp13.h
-# End Source File
-# Begin Source File
-
SOURCE=..\common\jk_ajp13_worker.h
# End Source File
# Begin Source File
-SOURCE=..\common\jk_ajp23_worker.h
+SOURCE=..\common\jk_ajp14_worker.h
# End Source File
# Begin Source File
@@ -245,15 +249,23 @@
# End Source File
# End Group
-SOURCE=..\common\jk_ajp14.h
+SOURCE=..\common\jk_ajp13.h
# End Source File
# End Group
-SOURCE=..\common\jk_ajp14_worker.h
+SOURCE=..\common\jk_ajp14.h
# End Source File
# End Group
SOURCE=..\common\jk_md5.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_context.h
+# End Source File
+# End Group
+
+SOURCE=..\common\jk_ajp_common.h
# End Source File
# End Group
1.2 +4 -3 jakarta-tomcat-connectors/jk/src/native/iis/jk_isapi_plugin.c
Index: jk_isapi_plugin.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/iis/jk_isapi_plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jk_isapi_plugin.c 2001/05/14 09:47:56 1.1
+++ jk_isapi_plugin.c 2001/06/07 14:13:11 1.2
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: ISAPI plugin for IIS/PWS *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.1 $ *
+ * Version: $Revision: 1.2 $ *
***************************************************************************/
#include <httpext.h>
@@ -639,7 +639,8 @@
rc = JK_FALSE;
if(map_alloc(&map)) {
if(map_read_properties(map, worker_file)) {
- if(wc_open(map, logger)) {
+ /* we add the URI->WORKER MAP since workers using AJP14 will feed it */
+ if(wc_open(map, uw_map, logger)) {
rc = JK_TRUE;
}
}
@@ -960,4 +961,4 @@
}
return JK_TRUE;
-}
\ No newline at end of file
+}