costin 2002/06/01 08:40:09
Modified: jk/native2/common jk_vm_default.c
jk/native2/server/apache2 mod_jk2.c
Log:
2 fixes from Mladen Turk: eliminate double version and add support for
another JVM layout style.
Thanks.
Revision Changes Path
1.16 +1 -0 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_vm_default.c 24 May 2002 04:29:22 -0000 1.15
+++ jk_vm_default.c 1 Jun 2002 15:40:09 -0000 1.16
@@ -151,6 +151,7 @@
*/
static const char *defaultVM_PATH[]={
"${JAVA_HOME}${fs}jre${fs}bin${fs}classic${fs}libjvm.${so}",
+ "${JAVA_HOME}${fs}jre${fs}bin${fs}client${fs}jvm.${so}",
"${JAVA_HOME}${fs}jre${fs}lib${fs}${arch}${fs}classic${fs}libjvm.${so}",
"${JAVA_HOME}${fs}jre${fs}lib${fs}${arch}${fs}client${fs}libjvm.${so}",
"${JAVA_HOME}${fs}jre${fs}bin${fs}classic${fs}jvm.${so}",
1.31 +1 -3 jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
Index: mod_jk2.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_jk2.c 31 May 2002 22:27:17 -0000 1.30
+++ mod_jk2.c 1 Jun 2002 15:40:09 -0000 1.31
@@ -59,7 +59,7 @@
* Description: Apache 2 plugin for Jakarta/Tomcat *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.30 $ *
+ * Version: $Revision: 1.31 $ *
***************************************************************************/
/*
@@ -464,8 +464,6 @@
if(s->is_virtual)
return OK;
-
- ap_add_version_component(pconf, JK_EXPOSED_VERSION);
env=workerEnv->globalEnv;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
