You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sh...@locus.apache.org on 2000/03/08 10:37:47 UTC
cvs commit: jakarta-tomcat/src/native/iis_netscape jk_util.c jk_uri_worker_map.c jk_lb_worker.c jk_jni_worker.c jk_global.h
shachor 00/03/08 01:37:46
Modified: src/native/iis_netscape jk_util.c jk_uri_worker_map.c
jk_lb_worker.c jk_jni_worker.c jk_global.h
Log:
Cross platform fixes
Revision Changes Path
1.4 +3 -3 jakarta-tomcat/src/native/iis_netscape/jk_util.c
Index: jk_util.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/iis_netscape/jk_util.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_util.c 2000/02/28 11:52:49 1.3
+++ jk_util.c 2000/03/08 09:37:45 1.4
@@ -56,7 +56,7 @@
/***************************************************************************
* Description: Utility functions (mainly configuration) *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
@@ -113,15 +113,15 @@
int jk_parse_log_level(const char *level)
{
- if(0 == stricmp(level, JK_LOG_INFO_VERB)) {
+ if(0 == strcasecmp(level, JK_LOG_INFO_VERB)) {
return JK_LOG_INFO_LEVEL;
}
- if(0 == stricmp(level, JK_LOG_ERROR_VERB)) {
+ if(0 == strcasecmp(level, JK_LOG_ERROR_VERB)) {
return JK_LOG_ERROR_LEVEL;
}
- if(0 == stricmp(level, JK_LOG_EMERG_VERB)) {
+ if(0 == strcasecmp(level, JK_LOG_EMERG_VERB)) {
return JK_LOG_EMERG_LEVEL;
}
1.4 +1 -1 jakarta-tomcat/src/native/iis_netscape/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/iis_netscape/jk_uri_worker_map.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_uri_worker_map.c 2000/02/28 11:52:48 1.3
+++ jk_uri_worker_map.c 2000/03/08 09:37:45 1.4
@@ -65,7 +65,7 @@
* servlet container. *
* *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -320,7 +320,7 @@
/* for WinXX, fix the JsP != jsp problems */
#ifdef WIN32
- if(0 == stricmp(suffix, uw_map->maps[i].suffix)) {
+ if(0 == strcasecmp(suffix, uw_map->maps[i].suffix)) {
#else
if(0 == strcmp(suffix, uw_map->maps[i].suffix)) {
#endif
1.4 +1 -1 jakarta-tomcat/src/native/iis_netscape/jk_lb_worker.c
Index: jk_lb_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/iis_netscape/jk_lb_worker.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_lb_worker.c 2000/02/28 11:52:46 1.3
+++ jk_lb_worker.c 2000/03/08 09:37:45 1.4
@@ -58,7 +58,7 @@
* several workers. *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Based on: *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#include "jk_pool.h"
@@ -148,7 +148,7 @@
unsigned i;
for(i = 0 ; i < s->num_headers ; i++) {
- if(0 == stricmp(s->headers_names[i], "cookie")) {
+ if(0 == strcasecmp(s->headers_names[i], "cookie")) {
char *id_start;
for(id_start = strstr(s->headers_values[i], name) ;
1.3 +10 -0 jakarta-tomcat/src/native/iis_netscape/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/iis_netscape/jk_jni_worker.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_jni_worker.c 2000/02/28 11:52:45 1.2
+++ jk_jni_worker.c 2000/03/08 09:37:46 1.3
@@ -57,7 +57,7 @@
* Description: In process JNI worker *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Based on: *
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
#include <jni.h>
@@ -472,6 +472,16 @@
}
FreeLibrary(hInst);
+ }
+#else
+ void *handle = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
+ if(handle) {
+ jni_create_java_vm = dlsym(handle, "JNI_CreateJavaVM");
+ jni_get_default_java_vm_init_args = dlsym(handle, "JNI_GetDefaultJavaVMInitArgs");
+ if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+ return JK_TRUE;
+ }
+ dlclose(handle);
}
#endif
1.4 +3 -0 jakarta-tomcat/src/native/iis_netscape/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/native/iis_netscape/jk_global.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_global.h 2000/02/28 11:52:45 1.3
+++ jk_global.h 2000/03/08 09:37:46 1.4
@@ -57,7 +57,7 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <sh...@il.ibm.com> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
@@ -122,6 +122,9 @@
#define PATH_SEPERATOR (';')
#define FILE_SEPERATOR ('\\')
#define PATH_ENV_VARIABLE ("PATH")
+
+ /* incompatible names... */
+ #define strcasecmp stricmp
#else
#define JK_METHOD
#define C_LEVEL_TRY_START