tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hgo...@apache.org
Subject svn commit: r531454 - in /tomcat/connectors/trunk/jk/native: apache-2.0/mod_jk.c common/jk_global.h
Date Mon, 23 Apr 2007 12:54:50 GMT
Author: hgomez
Date: Mon Apr 23 05:54:40 2007
New Revision: 531454

URL: http://svn.apache.org/viewvc?view=rev&rev=531454
Log:
i5/OS need to use apr string compare call instead of EBCDIC one

Modified:
    tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
    tomcat/connectors/trunk/jk/native/common/jk_global.h

Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=531454&r1=531453&r2=531454
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Mon Apr 23 05:54:40 2007
@@ -973,6 +973,11 @@
     if (conf->worker_file == NULL)
         return "JkWorkersFile file name invalid";
 
+	/* i5/OS need worker_file name in EBCDIC */
+#if defined(AS400_UTF8)
+    jk_ascii2ebcdic(conf->worker_file);
+#endif
+
     if (stat(conf->worker_file, &statbuf) == -1)
         return "Can't find the workers file specified";
 
@@ -1000,6 +1005,11 @@
 
     if (conf->mount_file == NULL)
         return "JkMountFile file name invalid";
+
+	/* i5/OS need mount_file name in EBCDIC */
+#if defined(AS400_UTF8)
+    jk_ascii2ebcdic(conf->mount_file);
+#endif
 
     if (stat(conf->mount_file, &statbuf) == -1)
         return "Can't find the mount file specified";

Modified: tomcat/connectors/trunk/jk/native/common/jk_global.h
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_global.h?view=diff&rev=531454&r1=531453&r2=531454
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_global.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_global.h Mon Apr 23 05:54:40 2007
@@ -354,6 +354,10 @@
 #define JK_INVALID_SOCKET  (-1)
 #endif
 
+#ifdef AS400_UTF8
+#define strcasecmp(a,b) apr_strnatcasecmp(a,b)
+#endif
+
 #ifdef __cplusplus
 }
 #endif                          /* __cplusplus */



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message