cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_msg_ajp.c

[hgomez]

hgomez      2002/09/24 15:39:21

  Modified:    jk/native2/common jk_msg_ajp.c
  Log:
  AS/400 / BS2000 back port from 1.2.0.
  
  Revision  Changes    Path
  1.19      +22 -3     jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c
  
  Index: jk_msg_ajp.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_msg_ajp.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- jk_msg_ajp.c      23 Jun 2002 15:54:13 -0000      1.18
  +++ jk_msg_ajp.c      24 Sep 2002 22:39:21 -0000      1.19
  @@ -253,8 +253,8 @@
   }
   
   
  -static int jk2_msg_ajp_appendString(jk_env_t *env, jk_msg_t *msg, 
  -                                    const char *param) 
  +static int jk2_msg_ajp_appendAString(jk_env_t *env, jk_msg_t *msg, 
  +                                     const char *param, int convert) 
   {
       int len;
   
  @@ -273,13 +273,31 @@
   
       /* 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)
  +    if (convert)
  +     jk_xlate_to_ascii((char *)msg->buf + msg->len, len+1);  /* convert from EBCDIC 
if needed */
  +#endif
       msg->len += len + 1;
   
       return JK_OK;
   }
   
   
  +
  +static int jk2_msg_ajp_appendString(jk_env_t *env, jk_msg_t *msg, 
  +                                    const char *param) 
  +{
  +    return jk2_msg_ajp_appendAString(env, msg, param, 1);
  +}
  +
  +
  +static int jk2_msg_ajp_appendAsciiString(jk_env_t *env, jk_msg_t *msg, 
  +                                         const char *param) 
  +{
  +    return jk2_msg_ajp_appendAString(env, msg, param, 0);
  +}
  +
  +
   static int jk2_msg_ajp_appendBytes(jk_env_t *env, jk_msg_t  *msg,
                                      const unsigned char  *param,
                                      const int len)
  @@ -516,6 +534,7 @@
       msg->appendInt=jk2_msg_ajp_appendInt;
       msg->appendLong=jk2_msg_ajp_appendLong;
       msg->appendString=jk2_msg_ajp_appendString;
  +    msg->appendAsciiString=jk2_msg_ajp_appendAsciiString;
       msg->appendMap=jk2_msg_ajp_appendMap;
   
       msg->appendFromServer=jk2_msg_ajp_appendFromServer;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>