tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GOMEZ Henri <hgo...@slib.fr>
Subject RE: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp _common.c jk_global.h jk_md5.c
Date Fri, 02 Nov 2001 14:25:43 GMT
Excellent works !

Now AS/400 users will be able to play with the jakarta-tomcat-connectors
mod_jk :)

-
Henri Gomez                 ___[_]____
EMAIL : hgomez@slib.fr        (. .)                     
PGP KEY : 697ECEDD    ...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



>-----Original Message-----
>From: jfclere@apache.org [mailto:jfclere@apache.org]
>Sent: Wednesday, October 31, 2001 3:03 PM
>To: jakarta-tomcat-connectors-cvs@apache.org
>Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common
>jk_ajp_common.c jk_global.h jk_md5.c
>
>
>jfclere     01/10/31 06:03:23
>
>  Modified:    jk/native/apache-1.3 mod_jk.c
>               jk/native/common jk_ajp_common.c jk_global.h jk_md5.c
>  Log:
>  Add support for BS2000 and finish EBCDIC support.
>  
>  Revision  Changes    Path
>  1.20      +3 -3      
>jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c
>  
>  Index: mod_jk.c
>  ===================================================================
>  RCS file: 
>/home/cvs/jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.c,v
>  retrieving revision 1.19
>  retrieving revision 1.20
>  diff -u -r1.19 -r1.20
>  --- mod_jk.c	2001/10/05 21:52:08	1.19
>  +++ mod_jk.c	2001/10/31 14:03:22	1.20
>  @@ -61,14 +61,14 @@
>    * Author:      Gal Shachor <shachor@il.ibm.com>            
>               *
>    *              Dan Milstein <danmil@shore.net>             
>               *
>    *              Henri Gomez <hgomez@slib.fr>                
>               *
>  - * Version:     $Revision: 1.19 $                           
>                *
>  + * Version:     $Revision: 1.20 $                           
>                *
>    
>***************************************************************
>************/
>   
>   /*
>    * mod_jk: keeps all servlet/jakarta related ramblings together.
>    */
>   
>  -#include "ap_config.h"
>  +/* #include "ap_config.h" */
>   #include "httpd.h"
>   #include "http_config.h"
>   #include "http_request.h"
>  @@ -79,7 +79,7 @@
>   #include "util_script.h"
>   #include "util_date.h"
>   #include "http_conf_globals.h"
>  - 
>  +
>   /*
>    * Jakarta (jk_) include files
>    */
>  
>  
>  
>  1.17      +9 -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.16
>  retrieving revision 1.17
>  diff -u -r1.16 -r1.17
>  --- jk_ajp_common.c	2001/10/13 17:36:36	1.16
>  +++ jk_ajp_common.c	2001/10/31 14:03:22	1.17
>  @@ -59,7 +59,7 @@
>    * Description: common stuff for bi-directional protocols 
>ajp13/ajp14.     *
>    * Author:      Gal Shachor <shachor@il.ibm.com>            
>               *
>    * Author:      Henri Gomez <hgomez@slib.fr>                
>               *
>  - * Version:     $Revision: 1.16 $                           
>                *
>  + * Version:     $Revision: 1.17 $                           
>                *
>    
>***************************************************************
>************/
>   
>   
>  @@ -447,6 +447,8 @@
>       }
>   
>       d->msg = (char *)jk_b_get_string(msg);
>  +    if (d->msg)
>  +        jk_xlate_from_ascii(d->msg, strlen(d->msg));
>   
>       jk_log(l, JK_LOG_DEBUG, "ajp_unmarshal_response: status 
>= %d\n", d->status);
>   
>  @@ -479,6 +481,9 @@
>                           jk_log(l, JK_LOG_ERROR, "Error 
>ajp_unmarshal_response - Null header name\n");
>                           return JK_FALSE;
>                       }
>  +                    jk_xlate_from_ascii(d->header_names[i],
>  +                                 strlen(d->header_names[i]));
>  +
>                   }
>   
>                   d->header_values[i] = (char *)jk_b_get_string(msg);
>  @@ -486,6 +491,9 @@
>                       jk_log(l, JK_LOG_ERROR, "Error 
>ajp_unmarshal_response - Null header value\n");
>                       return JK_FALSE;
>                   }
>  +
>  +                jk_xlate_from_ascii(d->header_values[i],
>  +                             strlen(d->header_values[i]));
>   
>                   jk_log(l, JK_LOG_DEBUG, 
>"ajp_unmarshal_response: Header[%d] [%s] = [%s]\n", 
>                          i,
>  
>  
>  
>  1.12      +4 -2      
>jakarta-tomcat-connectors/jk/native/common/jk_global.h
>  
>  Index: jk_global.h
>  ===================================================================
>  RCS file: 
>/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
>  retrieving revision 1.11
>  retrieving revision 1.12
>  diff -u -r1.11 -r1.12
>  --- jk_global.h	2001/10/26 14:02:18	1.11
>  +++ jk_global.h	2001/10/31 14:03:22	1.12
>  @@ -59,7 +59,7 @@
>    * Description: Global definitions and include files that 
>should exist     *
>    *              anywhere                                    
>               *
>    * Author:      Gal Shachor <shachor@il.ibm.com>            
>               *
>  - * Version:     $Revision: 1.11 $                           
>                    *
>  + * Version:     $Revision: 1.12 $                           
>                    *
>    
>***************************************************************
>************/
>   
>   #ifndef JK_GLOBAL_H
>  @@ -91,7 +91,9 @@
>           #include <netinet/tcp.h>
>           #include <arpa/inet.h>
>           #include <sys/un.h>
>  -        #include <sys/socketvar.h>
>  +        #ifndef _OSD_POSIX
>  +            #include <sys/socketvar.h>
>  +        #endif
>           #ifndef HPUX11
>               #include <sys/select.h>
>           #endif
>  
>  
>  
>  1.6       +2 -2      
>jakarta-tomcat-connectors/jk/native/common/jk_md5.c
>  
>  Index: jk_md5.c
>  ===================================================================
>  RCS file: 
>/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_md5.c,v
>  retrieving revision 1.5
>  retrieving revision 1.6
>  diff -u -r1.5 -r1.6
>  --- jk_md5.c	2001/06/19 15:55:04	1.5
>  +++ jk_md5.c	2001/10/31 14:03:22	1.6
>  @@ -103,7 +103,7 @@
>   
>/**************************************************************
>*************
>    * Description: MD5 encoding wrapper                        
>               *
>    * Author:      Henri Gomez <hgomez@slib.fr>                
>               *
>  - * Version:     $Revision: 1.5 $                            
>               *
>  + * Version:     $Revision: 1.6 $                            
>               *
>    
>***************************************************************
>************/
>   
>   /*
>  @@ -306,7 +306,7 @@
>       /* Since everything is converted to ascii within 
>jk_MD5Update(), 
>        * the initial 0x80 (PADDING[0]) must be stored as 0x20 
>        */
>  -    PADDING[0] = os_toebcdic[0x80];
>  +    ascii2ebcdic(PADDING,PADDING,1);
>   #endif /*CHARSET_EBCDIC*/
>   
>       /* Pad out to 56 mod 64. */
>  
>  
>  
>
>--
>To unsubscribe, e-mail:   
<mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>

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


Mime
View raw message