cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
hgomez 01/10/26 07:40:19 Modified:jk/native/common jk_msg_buff.c Log: Next step on EBCDIC work Revision ChangesPath 1.7 +3 -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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_msg_buff.c 2001/06/18 14:15:54 1.6 +++ jk_msg_buff.c 2001/10/26 14:40:19 1.7 @@ -60,7 +60,7 @@ * Author: Costin <[EMAIL PROTECTED]> * * Author: Gal Shachor <[EMAIL PROTECTED]> * * Author: Henri Gomez <[EMAIL PROTECTED]> * - * Version: $Revision: 1.6 $ * + * Version: $Revision: 1.7 $ * ***/ #include "jk_pool.h" @@ -291,7 +291,8 @@ jk_b_append_int(msg, (unsigned short )len); /* We checked for space !! */ -strncpy((char *)msg->buf + msg->len , param, len+1); /* including \0 */ +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 */ msg->len += len + 1; return 0;
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/11/11 09:03:29 Modified:jk/native/common jk_msg_buff.c Log: Backport message dumping from JK2. The message will dump if loglevel is trace Revision ChangesPath 1.22 +49 -7 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.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jk_msg_buff.c 11 Nov 2004 11:56:22 - 1.21 +++ jk_msg_buff.c 11 Nov 2004 17:03:29 - 1.22 @@ -39,11 +39,15 @@ int maxlen; }; +static char *jk_HEX = "0123456789ABCDEFX"; /* * Simple marshaling code. */ +/* Deprecated: We need smarter way for that. + Do not use stderr for logging + */ #if defined(DEBUG) || defined(_DEBUG) static void jk_b_dump(jk_msg_buf_t *msg, char *err) { @@ -388,12 +392,50 @@ int line, const char *funcname, int level, char *what, jk_msg_buf_t *msg) { -#ifdef USE_ALSO_BODY -jk_log(l, file, line, funcname, level, "%s #%d %.*s\n", - what, jk_b_get_len(msg), jk_b_get_len(msg), jk_b_get_buff(msg)); -#else -jk_log(l, file, line, funcname, level, "%s #%d\n", what, jk_b_get_len(msg)); -#endif +int i = 0; +char lb[80]; +char *current; +int j; +int len = msg->len; + +if (l->level == JK_LOG_DEBUG_LEVEL) { +len = 0; +} +else if (len > 1024) +len = 1024; + +jk_log(l, file, line, funcname, level, + "%s pos=%d len=%d max=%d \n", + what, msg->pos, msg->len, msg->maxlen); + +for (i = 0; i < len; i += 16) { +current = &lb[0]; + +for (j = 0; j < 16; j++) { +unsigned char x = (msg->buf[i + j]); + +*current++ = jk_HEX[x >> 4]; +*current++ = jk_HEX[x & 0x0f]; +*current++ = ' '; +} +*current++ = ' '; +*current++ = '-'; +*current++ = ' '; +for (j = 0; j < 16; j++) { +unsigned char x = msg->buf[i + j]; + +if (x > 0x20 && x < 0x7F) { +*current++ = x; +} +else { +*current++ = '.'; +} +} +*current++ = '\n'; +*current++ = '\0'; +jk_log(l, file, line, funcname, level, + "%.4x%s", i, line); +} } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/11/11 09:16:35 Modified:jk/native/common jk_msg_buff.c Log: When logrequest is DEBUG dump only message info. In any other case dump entire message packet. Also dump entire message when loglevel is trace. Revision ChangesPath 1.23 +6 -3 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.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jk_msg_buff.c 11 Nov 2004 17:03:29 - 1.22 +++ jk_msg_buff.c 11 Nov 2004 17:16:35 - 1.23 @@ -398,10 +398,13 @@ int j; int len = msg->len; -if (l->level == JK_LOG_DEBUG_LEVEL) { +if (level == JK_LOG_DEBUG_LEVEL) { len = 0; +if (l->level == JK_LOG_TRACE_LEVEL) +len = msg->len; } -else if (len > 1024) + +if (len > 1024) len = 1024; jk_log(l, file, line, funcname, level, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/11/19 04:59:54 Modified:jk/native/common jk_msg_buff.c Log: Fix typo in ajp packet dumping. Revision ChangesPath 1.24 +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.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- jk_msg_buff.c 11 Nov 2004 17:16:35 - 1.23 +++ jk_msg_buff.c 19 Nov 2004 12:59:54 - 1.24 @@ -437,7 +437,7 @@ *current++ = '\n'; *current++ = '\0'; jk_log(l, file, line, funcname, level, - "%.4x%s", i, line); + "%.4x%s", i, lb); } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/12/06 20:37:09 Modified:jk/native/common jk_msg_buff.c Log: Fix core dump if log is not defined. Revision ChangesPath 1.25 +4 -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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jk_msg_buff.c 19 Nov 2004 12:59:54 - 1.24 +++ jk_msg_buff.c 7 Dec 2004 04:37:09 - 1.25 @@ -397,7 +397,9 @@ char *current; int j; int len = msg->len; - + +if (l == NULL) +return; if (level == JK_LOG_DEBUG_LEVEL) { len = 0; if (l->level == JK_LOG_TRACE_LEVEL) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/12/07 06:49:07 Modified:jk/native/common jk_msg_buff.c Log: Remove all stderr error messages. We are using logger for those. Revision ChangesPath 1.26 +3 -49 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.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- jk_msg_buff.c 7 Dec 2004 04:37:09 - 1.25 +++ jk_msg_buff.c 7 Dec 2004 14:49:07 - 1.26 @@ -45,36 +45,6 @@ * Simple marshaling code. */ -/* Deprecated: We need smarter way for that. - Do not use stderr for logging - */ -#if defined(DEBUG) || defined(_DEBUG) -static void jk_b_dump(jk_msg_buf_t *msg, char *err) -{ -int i = 0; -fprintf(stderr, -"%s %d/%d/%d %x %x %x %x - %x %x %x %x - %x %x %x %x - %x %x %x %x\n", -err, msg->pos, msg->len, msg->maxlen, -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++], -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++], -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++], -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++]); - -i = msg->pos - 4; -if (i < 0) { -i = 0; -} - -fprintf(stderr, -"%x %x %x %x - %x %x %x %x --- %x %x %x %x - %x %x %x %x\n", -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++], -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++], -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++], -msg->buf[i++], msg->buf[i++], msg->buf[i++], msg->buf[i++]); - -} -#endif - void jk_b_reset(jk_msg_buf_t *msg) { msg->len = 4; @@ -282,9 +252,6 @@ { unsigned long i; if (msg->pos + 3 > msg->len) { -#if defined(DEBUG) || defined(_DEBUG) -fprintf(stderr, "jk_b_get_long::Read after end \n"); -#endif return 0x; } i = ((msg->buf[(msg->pos++)] & 0xFF) << 24); @@ -309,9 +276,6 @@ { unsigned short i; if (msg->pos + 1 > msg->len) { -#if defined(DEBUG) || defined(_DEBUG) -fprintf(stderr, "jk_b_get_int::Read after end \n"); -#endif return 0x; } i = ((msg->buf[(msg->pos++)] & 0xFF) << 8); @@ -331,9 +295,6 @@ { unsigned char rc; if (msg->pos > msg->len) { -#if defined(DEBUG) || defined(_DEBUG) -fprintf(stderr, "jk_b_get_byte::Read after end \n"); -#endif return 0xFF; } rc = msg->buf[msg->pos++]; @@ -353,11 +314,8 @@ int start = msg->pos; if ((size == 0x) || (size + start > msg->maxlen)) { -#if defined (DEBUG) || (_DEBUG) -jk_b_dump(msg, "After get int"); -fprintf(stderr, "ERROR\n"); -#endif -return (unsigned char *)"ERROR";/* XXX */ +/* TODO: return NULL and deal with that in the code */ +return (unsigned char *)"ERROR"; } msg->pos += size; @@ -371,10 +329,6 @@ int start = msg->pos; if ((len < 0) || (len + start > msg->maxlen)) { -#if defined (DEBUG) || (_DEBUG) -jk_b_dump(msg, "After get bytes"); -fprintf(stderr, "ERROR\n"); -#endif return (-1); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2005/02/16 03:42:46 Modified:jk/native/common jk_msg_buff.c Log: Do not log trash data when dumping ajp message. Revision ChangesPath 1.28 +5 -3 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.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- jk_msg_buff.c 6 Feb 2005 09:37:59 - 1.27 +++ jk_msg_buff.c 16 Feb 2005 11:42:46 - 1.28 @@ -372,7 +372,8 @@ for (j = 0; j < 16; j++) { unsigned char x = (msg->buf[i + j]); - +if ((i + j) >= len) +x = 0; *current++ = jk_HEX[x >> 4]; *current++ = jk_HEX[x & 0x0f]; *current++ = ' '; @@ -382,7 +383,8 @@ *current++ = ' '; for (j = 0; j < 16; j++) { unsigned char x = msg->buf[i + j]; - +if ((i + j) >= len) +x = 0; if (x > 0x20 && x < 0x7F) { *current++ = x; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2005/04/21 05:14:21 Modified:jk/native/common jk_msg_buff.c Log: Dump entire message if log level is trace. In debug level log first 1024 bytes. Revision ChangesPath 1.30 +2 -8 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_msg_buff.c 21 Apr 2005 12:04:18 - 1.29 +++ jk_msg_buff.c 21 Apr 2005 12:14:21 - 1.30 @@ -314,13 +314,7 @@ if (l == NULL) return; -if (level == JK_LOG_DEBUG_LEVEL) { -len = 0; -if (l->level == JK_LOG_TRACE_LEVEL) -len = msg->len; -} - -if (len > 1024) +if (l->level != JK_LOG_TRACE_LEVEL && len > 1024) len = 1024; jk_log(l, file, line, funcname, level, - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c jk_msg_buff.h
mturk 2004/10/06 03:16:10 Modified:jk/native/common jk_msg_buff.c jk_msg_buff.h Log: Use direct message conversion instead function calls. Also fix style and compile time warnings. Revision ChangesPath 1.17 +90 -109 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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jk_msg_buff.c 24 Feb 2004 08:45:46 - 1.16 +++ jk_msg_buff.c 6 Oct 2004 10:16:10 - 1.17 @@ -29,7 +29,7 @@ #include "jk_msg_buff.h" #include "jk_logger.h" -struct jk_msg_buf { +struct jk_msg_buf_t { jk_pool_t *pool; unsigned char *buf; @@ -43,29 +43,33 @@ * Simple marshaling code. */ -/* XXX what's above this line can go to .h XXX */ -void jk_b_dump(jk_msg_buf_t *msg, - char *err) +#ifdef DEBUG +static void jk_b_dump(jk_msg_buf_t *msg, + char *err) { int i=0; - printf("%s %d/%d/%d %x %x %x %x - %x %x %x %x - %x %x %x %x - %x %x %x %x\n", err, msg->pos, msg->len, msg->maxlen, -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++]); +fprintf(stderr, +"%s %d/%d/%d %x %x %x %x - %x %x %x %x - %x %x %x %x - %x %x %x %x\n", +err, msg->pos, msg->len, msg->maxlen, +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++]); - i = msg->pos - 4; +i = msg->pos - 4; if(i < 0) { i=0; } - -printf("%x %x %x %x - %x %x %x %x --- %x %x %x %x - %x %x %x %x\n", -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], -msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++]); + +fprintf(stderr, +"%x %x %x %x - %x %x %x %x --- %x %x %x %x - %x %x %x %x\n", +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++], +msg->buf[i++],msg->buf[i++],msg->buf[i++],msg->buf[i++]); } +#endif void jk_b_reset(jk_msg_buf_t *msg) { @@ -73,74 +77,44 @@ msg->pos = 4; } - -static void jk_b_set_long(jk_msg_buf_t *msg, - int pos, - unsigned long val) -{ -msg->buf[pos] = (unsigned char)((val >> 24) & 0xFF); -msg->buf[pos + 1] = (unsigned char)((val >> 16) & 0xFF); -msg->buf[pos + 2] = (unsigned char)((val >> 8) & 0xFF); -msg->buf[pos + 3] = (unsigned char)(val & 0xFF); -} - - int jk_b_append_long(jk_msg_buf_t *msg, unsigned long val) { if(msg->len + 4 > msg->maxlen) { return -1; } - -jk_b_set_long(msg, msg->len, val); - -msg->len += 4; + +msg->buf[msg->len++] = (unsigned char)((val >> 24) & 0xFF); +msg->buf[msg->len++] = (unsigned char)((val >> 16) & 0xFF); +msg->buf[msg->len++] = (unsigned char)((val >> 8) & 0xFF); +msg->buf[msg->len++] = (unsigned char)((val) & 0xFF); return 0; } -static void jk_b_set_int(jk_msg_buf_t *msg, - int pos, - unsigned short val) -{ -msg->buf[pos] = (unsigned char)((val >> 8) & 0xFF); -msg->buf[pos + 1] = (unsigned char)(val & 0xFF); -} - - int jk_b_append_int(jk_msg_buf_t *msg, unsigned short val) { if(msg->len + 2 > msg->maxlen) { - return -1; +return -1; } -jk_b_set_int(msg, msg->len, val); - -msg->len += 2; +msg->buf[msg->len++] = (unsigned char)((val >> 8) & 0xFF); +msg->buf[msg->len++] = (unsigned char)((val) & 0xFF); return 0; } -static void jk_b_set_byte(jk_msg_buf_t *msg, - int pos, - unsigned char val) -{ -msg->buf[pos]= val; -} - int jk_b_append_byte(jk_msg_buf_t *msg, unsigned char val) { if(msg->len + 1 > msg->maxlen) { - return -1; +return -1
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c jk_pool.c
mturk 2004/11/11 03:56:22 Modified:jk/native/common jk_msg_buff.c jk_pool.c Log: Fix #if defined macros Revision ChangesPath 1.21 +5 -5 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.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- jk_msg_buff.c 11 Nov 2004 09:45:23 - 1.20 +++ jk_msg_buff.c 11 Nov 2004 11:56:22 - 1.21 @@ -44,7 +44,7 @@ * Simple marshaling code. */ -#if defined (DEBUG) || (_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) static void jk_b_dump(jk_msg_buf_t *msg, char *err) { int i = 0; @@ -278,7 +278,7 @@ { unsigned long i; if (msg->pos + 3 > msg->len) { -#if defined (DEBUG) || (_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) fprintf(stderr, "jk_b_get_long::Read after end \n"); #endif return 0x; @@ -305,7 +305,7 @@ { unsigned short i; if (msg->pos + 1 > msg->len) { -#if defined (DEBUG) || (_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) fprintf(stderr, "jk_b_get_int::Read after end \n"); #endif return 0x; @@ -327,7 +327,7 @@ { unsigned char rc; if (msg->pos > msg->len) { -#if defined (DEBUG) || (_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) fprintf(stderr, "jk_b_get_byte::Read after end \n"); #endif return 0xFF; 1.11 +5 -2 jakarta-tomcat-connectors/jk/native/common/jk_pool.c Index: jk_pool.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_pool.c 10 Nov 2004 16:28:31 - 1.10 +++ jk_pool.c 11 Nov 2004 11:56:22 - 1.11 @@ -114,7 +114,7 @@ return rc; } -#if defined (DEBUG) || (_DEBUG) +#if defined (DEBUG) || defined(_DEBUG) void jk_dump_pool(jk_pool_t *p, FILE * f) { fprintf(f, "Dumping for pool [%p]\n", p); @@ -148,6 +148,9 @@ p->dyn_size = new_dyn_size; } else { +#if defined (DEBUG) || defined(_DEBUG) +jk_dump_pool(p, stderr) +#endif return NULL; } } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/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
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 ChangesPath 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: