andya 01/06/13 14:30:36 Modified: jk/native/common jk_msg_buff.c jk_md5.c jk_ajp_common.h jk_ajp_common.c jk_ajp14_worker.c jk_ajp14.c Log: Tidied up a few minor syntax errors that were breaking the build with Visual Studio and added a few casts to get rid of warnings Revision Changes Path 1.5 +2 -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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_msg_buff.c 2001/06/07 14:38:51 1.4 +++ jk_msg_buff.c 2001/06/13 21:30:19 1.5 @@ -58,7 +58,7 @@ * Author: Costin <[EMAIL PROTECTED]> * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.4 $ * + * Version: $Revision: 1.5 $ * ***************************************************************************/ #include "jk_pool.h" @@ -191,7 +191,7 @@ * Ugly way to set the size in the right position */ jk_b_set_int(msg, 2, (unsigned short )(msg->len - 4)); /* see protocol */ - jk_b_set_int(msg, 0, protoh); + jk_b_set_int(msg, 0, (unsigned short) protoh); } 1.3 +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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_md5.c 2001/05/21 15:23:39 1.2 +++ jk_md5.c 2001/06/13 21:30:21 1.3 @@ -103,7 +103,7 @@ /*************************************************************************** * Description: MD5 encoding wrapper * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.2 $ * + * Version: $Revision: 1.3 $ * ***************************************************************************/ /* @@ -165,7 +165,7 @@ static void Decode(JK_UINT4 *output, const unsigned char *input, unsigned int len); static void jk_MD5Init(JK_MD5_CTX *context); static void jk_MD5Update(JK_MD5_CTX *context, const unsigned char *input, unsigned int inputLen); -static void jk_MD5Final(unsigned char digest[JK_MD5_DIGESTSIZE], JK_MD5_CTX *context); +/*static void jk_MD5Final(unsigned char digest[JK_MD5_DIGESTSIZE], JK_MD5_CTX *context);*/ static unsigned char PADDING[64] = { 1.3 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h Index: jk_ajp_common.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_ajp_common.h 2001/06/12 06:28:08 1.2 +++ jk_ajp_common.h 2001/06/13 21:30:23 1.3 @@ -57,7 +57,7 @@ * Description: common stuff for bi-directional protocol ajp13/ajp14. * * Author: Henri Gomez <[EMAIL PROTECTED]> * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.2 $ * + * Version: $Revision: 1.3 $ * ***************************************************************************/ #ifndef JK_AJP_COMMON_H @@ -304,8 +304,8 @@ jk_logger_t *l, int proto); -int ajp_done(jk_endpoint_t **e, - jk_logger_t *l); +int JK_METHOD ajp_done(jk_endpoint_t **e, + jk_logger_t *l); int ajp_get_endpoint(jk_worker_t *pThis, jk_endpoint_t **pend, 1.3 +6 -5 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_ajp_common.c 2001/06/12 06:28:07 1.2 +++ jk_ajp_common.c 2001/06/13 21:30:25 1.3 @@ -57,7 +57,7 @@ * Description: common stuff for bi-directional protocols ajp13/ajp14. * * Author: Henri Gomez <[EMAIL PROTECTED]> * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.2 $ * + * Version: $Revision: 1.3 $ * ***************************************************************************/ @@ -66,6 +66,7 @@ #include "jk_ajp13.h" #include "jk_ajp14.h" #include "jk_ajp_common.h" +#include "jk_connect.h" const char *response_trans_headers[] = { "Content-Type", @@ -361,7 +362,7 @@ */ if ((ae->proto == AJP14_PROTO) && (s->ssl_key_size != -1)) { if (jk_b_append_byte(msg, SC_A_SSL_KEY_SIZE) || - jk_b_append_int(msg, s->ssl_key_size)) { + jk_b_append_int(msg, (unsigned short) s->ssl_key_size)) { jk_log(l, JK_LOG_ERROR, "Error ajp_marshal_into_msgb - Error appending the SSL key size\n"); return JK_FALSE; } @@ -984,7 +985,7 @@ * We serve here the request, using AJP13/AJP14 (e->proto) * */ -int ajp_service(jk_endpoint_t *e, +int JK_METHOD ajp_service(jk_endpoint_t *e, jk_ws_service_t *s, jk_logger_t *l, int *is_recoverable_error) @@ -1205,8 +1206,8 @@ return JK_FALSE; } -int ajp_done(jk_endpoint_t **e, - jk_logger_t *l) +int JK_METHOD ajp_done(jk_endpoint_t **e, + jk_logger_t *l) { jk_log(l, JK_LOG_DEBUG, "Into jk_endpoint_t::done\n"); 1.4 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c Index: jk_ajp14_worker.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jk_ajp14_worker.c 2001/06/12 06:28:51 1.3 +++ jk_ajp14_worker.c 2001/06/13 21:30:27 1.4 @@ -56,7 +56,7 @@ /*************************************************************************** * Description: AJP14 next generation Bi-directional protocol. * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.3 $ * + * Version: $Revision: 1.4 $ * ***************************************************************************/ #include "jk_context.h" @@ -101,7 +101,7 @@ ajp_worker_t *aw; ajp_endpoint_t *ae; jk_endpoint_t *je; - char *secret_key; + /*char *secret_key; unused */ if (ajp_init(pThis, props, we, l, AJP14_PROTO) == JK_FALSE) return JK_FALSE; 1.6 +11 -10 jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c Index: jk_ajp14.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jk_ajp14.c 2001/06/12 06:28:51 1.5 +++ jk_ajp14.c 2001/06/13 21:30:28 1.6 @@ -56,7 +56,7 @@ /*************************************************************************** * Description: Next generation bi-directional protocol handler. * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.5 $ * + * Version: $Revision: 1.6 $ * ***************************************************************************/ @@ -65,6 +65,7 @@ #include "jk_map.h" #include "jk_ajp_common.h" #include "jk_ajp14.h" +#include "jk_md5.h" /* * Compute the MD5 with ENTROPY / SECRET KEY @@ -340,7 +341,7 @@ /* * UNHANDLED MESSAGE SIZE */ - if (jk_b_append_int(msg, jk_b_get_len(unk))) + if (jk_b_append_int(msg, (unsigned short) jk_b_get_len(unk))) return JK_FALSE; /* @@ -408,7 +409,7 @@ jk_logger_t *l) { char *sname; - char *old; + /* char *old; unused */ int i; sname = (char *)jk_b_get_string(msg); @@ -431,7 +432,7 @@ sname = (char *)jk_b_get_string(msg); if (! sname) { - log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get context\n"); + jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get context\n"); return JK_FALSE; } @@ -441,7 +442,7 @@ context->cbase = strdup(sname); if (! context->cbase) { - log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't malloc context\n"); + jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't malloc context\n"); return JK_FALSE; } @@ -450,16 +451,16 @@ sname = (char *)jk_b_get_string(msg); if (!sname) { - log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get URL\n"); + jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_info - can't get URL\n"); return JK_FALSE; } if (! strlen(sname)) { - log(l, JK_LOG_INFO, "No more URI/URL (%d)", i); + jk_log(l, JK_LOG_INFO, "No more URI/URL (%d)", i); break; } - log(l, JK_LOG_INFO, "Got URL (%s) for virtualhost %s and base context %s", sname, context->virtual, context->cbase); + jk_log(l, JK_LOG_INFO, "Got URL (%s) for virtualhost %s and base context %s", sname, context->virtual, context->cbase); context_add_uri(context, sname); } @@ -546,7 +547,7 @@ sname = (char *)jk_b_get_string(msg); if (! sname) { - log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply - can't get context\n"); + jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply - can't get context\n"); return JK_FALSE; } @@ -556,7 +557,7 @@ context->cbase = strdup(sname); if (! context->cbase) { - log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply - can't malloc context\n"); + jk_log(l, JK_LOG_ERROR, "Error ajp14_unmarshal_context_state_reply - can't malloc context\n"); return JK_FALSE; }