hgomez 2002/09/24 15:37:13
Modified: jk/native2/common jk_config_file.c jk_logger_file.c
Log:
AS/400 back port from 1.2.0.
Revision Changes Path
1.5 +11 -3 jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c
Index: jk_config_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jk_config_file.c 8 Jul 2002 13:40:41 -0000 1.4
+++ jk_config_file.c 24 Sep 2002 22:37:13 -0000 1.5
@@ -83,7 +83,11 @@
if( workerFile== NULL )
return JK_ERR;
- fp= fopen(workerFile, "w");
+#ifdef AS400
+ fp = fopen(workerFile, "w, o_ccsid=0");
+#else
+ fp = fopen(workerFile, "w");
+#endif
if(fp==NULL)
return JK_ERR;
@@ -226,8 +230,12 @@
if(m==NULL || file==NULL )
return JK_ERR;
- fp= fopen(file, "r");
-
+#ifdef AS400
+ fp = fopen(file, "r, o_ccsid=0");
+#else
+ fp = fopen(file, "r");
+#endif
+
if(fp==NULL)
return JK_ERR;
1.33 +8 -2 jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c
Index: jk_logger_file.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_logger_file.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_logger_file.c 10 Sep 2002 13:40:08 -0000 1.32
+++ jk_logger_file.c 24 Sep 2002 22:37:13 -0000 1.33
@@ -160,7 +160,13 @@
if( strcmp( "stderr", _this->name )==0 ) {
_this->logger_private = stderr;
} else {
- f = fopen(_this->name, "a+");
+
+#ifdef AS400
+ f = fopen(_this->name, "a+, o_ccsid=0");
+#else
+ f = fopen(_this->name, "a+");
+#endif
+
if(f==NULL) {
_this->jkLog(env, _this,JK_LOG_ERROR,
"Can't open log file %s\n", _this->name );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
