Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 82958 invoked from network); 23 Apr 2007 15:10:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Apr 2007 15:10:43 -0000 Received: (qmail 57414 invoked by uid 500); 23 Apr 2007 15:10:44 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 57367 invoked by uid 500); 23 Apr 2007 15:10:44 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 57356 invoked by uid 500); 23 Apr 2007 15:10:44 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 57353 invoked by uid 99); 23 Apr 2007 15:10:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 08:10:44 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Apr 2007 08:10:37 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E51071A9838; Mon, 23 Apr 2007 08:10:16 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r531494 - /tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Date: Mon, 23 Apr 2007 15:10:16 -0000 To: tomcat-dev@jakarta.apache.org From: hgomez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070423151016.E51071A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hgomez Date: Mon Apr 23 08:10:13 2007 New Revision: 531494 URL: http://svn.apache.org/viewvc?view=rev&rev=531494 Log: More fix for ASCII/EBCDIC fun in i5/OS V5R4 Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c 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=531494&r1=531493&r2=531494 ============================================================================== --- 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 08:10:13 2007 @@ -973,12 +973,7 @@ 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) + if (jk_file_exists(conf->worker_file) != JK_TRUE) return "Can't find the workers file specified"; return NULL; @@ -1006,12 +1001,7 @@ 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) + if (jk_file_exists(conf->mount_file) != JK_TRUE) return "Can't find the mount file specified"; return NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org