You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2001/05/21 17:23:53 UTC

cvs commit: jakarta-tomcat-connectors/jk/src/native/common jk_ajp14.c jk_md5.c

hgomez      01/05/21 08:23:53

  Modified:    jk/src/native/common jk_ajp14.c jk_md5.c
  Log:
  updated md5 support under both Apache 1.3 and 2.0
  reduced size of unknow block len in ajp14
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-tomcat-connectors/jk/src/native/common/jk_ajp14.c
  
  Index: jk_ajp14.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_ajp14.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_ajp14.c	2001/05/18 16:47:05	1.1
  +++ jk_ajp14.c	2001/05/21 15:23:34	1.2
  @@ -56,7 +56,7 @@
   /***************************************************************************
    * Description: Next generation bi-directional protocol handler.           *
    * Author:      Henri Gomez <hg...@slib.fr>                               *
  - * Version:     $Revision: 1.1 $                                           *
  + * Version:     $Revision: 1.2 $                                           *
    ***************************************************************************/
   
   
  @@ -156,7 +156,7 @@
    * Build the Unknown Packet
    *
    * +-----------------------------+---------------------------------+------------------------------+
  - * | UNKNOWN PACKET CMD (1 byte) | UNHANDLED MESSAGE SIZE (32bits) | UNHANDLED MESSAGE (bytes...) |
  + * | UNKNOWN PACKET CMD (1 byte) | UNHANDLED MESSAGE SIZE (16bits) | UNHANDLED MESSAGE (bytes...) |
    * +-----------------------------+---------------------------------+------------------------------+
    *
    */
  @@ -179,7 +179,7 @@
   	/*
   	 * UNHANDLED MESSAGE SIZE
   	 */
  -	if (jk_b_append_long(msg, jk_b_get_len(unk)))
  +	if (jk_b_append_int(msg, jk_b_get_len(unk)))
   		return JK_FALSE;
   
   	/*
  
  
  
  1.2       +14 -1     jakarta-tomcat-connectors/jk/src/native/common/jk_md5.c
  
  Index: jk_md5.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_md5.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jk_md5.c	2001/05/18 16:49:46	1.1
  +++ jk_md5.c	2001/05/21 15:23:39	1.2
  @@ -103,7 +103,7 @@
   /***************************************************************************
    * Description: MD5 encoding wrapper                                       *
    * Author:      Henri Gomez <hg...@slib.fr>                               *
  - * Version:     $Revision: 1.1 $                                           *
  + * Version:     $Revision: 1.2 $                                           *
    ***************************************************************************/
   
   /*
  @@ -474,9 +474,22 @@
   
   #else /* USE_APACHE_MD5 */
   
  -#include "ap_config.h"
   #include "httpd.h"
  +#include "http_config.h"
  +
  +#ifdef STANDARD20_MODULE_STUFF
  +
  +#include "apr_md5.h"
  +#define  AP_MD5_CTX 	apr_md5_ctx_t
  +#define  ap_MD5Init 	apr_md5_init
  +#define  ap_MD5Update 	apr_md5_update
  +#define  ap_MD5Final 	apr_md5_final
  +
  +#else /* STANDARD20_MODULE_STUFF */
  +
   #include "ap_md5.h"
  +
  +#endif /* STANDARD20_MODULE_STUFF */
   
   char * JK_METHOD jk_md5(const unsigned char *org, const unsigned char *org2, char *dst)
   {