jfclere 2002/09/20 04:28:16
Modified: jk/native/common jk_ajp12_worker.c jk_ajp_common.c
jk_jni_worker.c jk_msg_buff.c
Log:
Add BS2000 support.
Revision Changes Path
1.9 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c
Index: jk_ajp12_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp12_worker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jk_ajp12_worker.c 4 Sep 2002 11:31:32 -0000 1.8
+++ jk_ajp12_worker.c 20 Sep 2002 11:28:16 -0000 1.9
@@ -357,7 +357,7 @@
int bufferlen;
if(buffer && (bufferlen = strlen(buffer))) {
-#ifdef AS400
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_to_ascii(buffer, bufferlen);
#endif
return ajpv12_sendnbytes(p, buffer, bufferlen);
@@ -559,7 +559,7 @@
jk_log(l, JK_LOG_ERROR, "ajpv12_handle_response, error reading header
line\n");
return JK_FALSE;
}
-#ifdef AS400
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(line, strlen(line));
#endif
1.30 +7 -1 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jk_ajp_common.c 4 Sep 2002 11:31:32 -0000 1.29
+++ jk_ajp_common.c 20 Sep 2002 11:28:16 -0000 1.30
@@ -475,7 +475,9 @@
d->msg = (char *)jk_b_get_string(msg);
if (d->msg) {
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d->msg, strlen(d->msg));
+#endif
}
jk_log(l, JK_LOG_DEBUG, "ajp_unmarshal_response: status = %d\n", d->status);
@@ -509,8 +511,10 @@
jk_log(l, JK_LOG_ERROR, "Error ajp_unmarshal_response -
Null header name\n");
return JK_FALSE;
}
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d->header_names[i],
strlen(d->header_names[i]));
+#endif
}
@@ -520,8 +524,10 @@
return JK_FALSE;
}
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_from_ascii(d->header_values[i],
strlen(d->header_values[i]));
+#endif
jk_log(l, JK_LOG_DEBUG, "ajp_unmarshal_response: Header[%d] [%s] =
[%s]\n",
i,
1.19 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_jni_worker.c 16 Sep 2002 11:46:06 -0000 1.18
+++ jk_jni_worker.c 20 Sep 2002 11:28:16 -0000 1.19
@@ -250,7 +250,7 @@
/*
Duplicate string and convert it to ASCII on EBDIC based system
- Needed for at least AS/400, what about BS2000 ?
+ Needed for at least AS/400, BS2000 and what about other EBDIC systems ?
*/
static void *strdup_ascii(jk_pool_t *p,
char *s)
@@ -258,7 +258,7 @@
char * rc;
rc = jk_pool_strdup(p, s);
-#ifdef AS400
+#if defined(AS400) || defined(_OSD_POSIX)
jk_xlate_to_ascii(rc, strlen(rc));
#endif
1.12 +5 -2 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_msg_buff.c 4 Sep 2002 11:31:33 -0000 1.11
+++ jk_msg_buff.c 20 Sep 2002 11:28:16 -0000 1.12
@@ -319,7 +319,10 @@
/* We checked for space !! */
strncpy((char *)msg->buf + msg->len , param, len+1); /* including \0 */
- jk_xlate_to_ascii((char *)msg->buf + msg->len, len+1); /* convert from EBCDIC
if needed */
+#if defined(AS400) || defined(_OSD_POSIX)
+ /* convert from EBCDIC if needed */
+ jk_xlate_to_ascii((char *)msg->buf + msg->len, len+1);
+#endif
msg->len += len + 1;
return 0;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
