--- jakarta-tomcat/src/native/mod_jk/apache1.3/Makefile.linux.orig	Tue Nov  7 19:27:59 2000
+++ jakarta-tomcat/src/native/mod_jk/apache1.3/Makefile.linux	Tue Nov  7 19:27:48 2000
@@ -1,37 +1,23 @@
 ## You need to edit this file - configure later :-)
 
-APACHE_HOME=/usr/local/apache
-OS=linux
-APXS=${APACHE_HOME}/bin/apxs
-
-A13_FLAGS=-I${APACHE_HOME}/include
-
 ## I assume this one is set up already
 # JAVA_HOME=
+OS=linux
 
-JAVA_INCL=-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS}
-JAVA_LIB=-L${JAVA_HOME}/jre/lib/${ARCH} -L${JAVA_HOME}/lib/${ARCH}/native_threads
-
-CFLAGS=-DHAVE_CONFIG_H -g -fpic  -DSHARED_MODULE -O2 -D_REENTRANT -pthread -DLINUX -Wall
+JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
+JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
+APXS=/usr/sbin/apxs
 
 JK=../common/
-SRCS=jk_ajp12_worker.c jk_connect.c jk_msg_buff.c jk_util.c jk_ajp13.c \
-     jk_jni_worker.c jk_pool.c jk_worker.c jk_ajp13_worker.c jk_lb_worker.c \
-     jk_sockbuf.c  jk_map.c jk_uri_worker_map.c          
-
-
-OBJS=${patsubst %.c,%.o,${SRCS}}
-
-%.o: ../common/%.c 
-	${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} $< -o $@ 
+SRCS=${JK}/jk_ajp12_worker.c ${JK}/jk_connect.c ${JK}/jk_msg_buff.c ${JK}/jk_util.c ${JK}/jk_ajp13.c \
+     ${JK}/jk_jni_worker.c ${JK}/jk_pool.c ${JK}/jk_worker.c ${JK}/jk_ajp13_worker.c ${JK}/jk_lb_worker.c \
+     ${JK}/jk_sockbuf.c  ${JK}/jk_map.c ${JK}/jk_uri_worker_map.c          
 
-.c.o:
-	${CC} -c ${CFLAGS} ${JAVA_INCL} ${A13_FLAGS} -I../common $<
 
 all: mod_jk.so
 
-mod_jk.so: ${OBJS} mod_jk.o
-	$(CC) -shared -o mod_jk.so ${OBJS} mod_jk.o
+mod_jk.so: 
+	$(APXS) -I ${JK} ${JAVA_INCL} -c -o $@ mod_jk.c $(SRCS) 
 
 clean:
 	rm *.o *.so
--- jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c.orig	Sat Aug 26 03:21:39 2000
+++ jakarta-tomcat/src/native/mod_jk/apache1.3/mod_jk.c	Fri Nov 10 18:08:30 2000
@@ -54,7 +54,7 @@
  */
 
 /***************************************************************************
- * Description: Apache 2 plugin for Jakarta/Tomcat                         *
+ * Description: Apache 1.3 plugin for Jakarta/Tomcat                       *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  * Version:     $ $                                                        *
  ***************************************************************************/
@@ -78,6 +78,14 @@
 /*
  * Jakarta (jk_) include files
  */
+#ifdef NETWARE
+#define _SYS_TYPES_H_
+#define _NETDB_H_INCLUDED
+#define _IN_
+#define _INET_
+#define _SYS_TIMEVAL_H_
+#define _SYS_SOCKET_H_
+#endif
 #include "jk_global.h"
 #include "jk_util.h"
 #include "jk_map.h"
@@ -343,7 +351,7 @@
     s->remote_host  = NULL_FOR_EMPTY(s->remote_host);
 
     s->remote_addr  = NULL_FOR_EMPTY(r->connection->remote_ip);
-    s->server_name  = (char *)(r->hostname ? r->server->server_hostname : r->hostname);
+    s->server_name  = (char *)(r->hostname ? r->hostname : r->server->server_hostname);
     s->server_port  = r->server->port;
     s->server_software = (char *)ap_get_server_version();
 
@@ -823,13 +831,10 @@
 
 static void jk_init(server_rec *s, ap_pool *p)
 {
-    char *env = getenv("WAS_BORN_BY_APACHE");
     jk_map_t *init_map = NULL;
     jk_server_conf_t *conf =
         (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
 
-    fprintf(stdout, "jk_post_config %s\n", env ? env : "NULL"); fflush(stdout);
-        
     if(conf->log_file && conf->log_level >= 0) {
         if(!jk_open_file_logger(&(conf->log), 
                                 conf->log_file, 
@@ -850,14 +855,15 @@
 
     if(map_alloc(&init_map)) {
         if(map_read_properties(init_map, conf->worker_file)) {
-            if(!env) {
-                putenv("WAS_BORN_BY_APACHE=true");
-                return;
-            } else {
+
+#if MODULE_MAGIC_NUMBER >= 19980527
+    			/* Tell apache we're here */
+    			ap_add_version_component("mod_jk");
+#endif
+
                 if(wc_open(init_map, conf->log)) {
                     return;
                 }            
-            }
         }
     }
 
@@ -882,7 +888,6 @@
             if(worker) {
                 r->handler = ap_pstrdup(r->pool, JK_HANDLER);
                 ap_table_setn(r->notes, JK_WORKER_ID, worker);
-                return OK;
             }
         }
     }
--- jakarta-tomcat/src/native/mod_jk/common/jk_ajp12_worker.c.orig	Sat Aug 26 03:21:44 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_ajp12_worker.c	Fri Jun 23 12:34:03 2000
@@ -57,7 +57,7 @@
  * Description: ajpv1.2 worker, used to call local or remote jserv hosts   *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  * Based on:    jserv_ajpv12.c from Jserv                                  *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2 $                                               *
  ***************************************************************************/
 
 #include "jk_ajp12_worker.h"
--- jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.c.orig	Sat Aug 26 03:21:44 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.c	Sun Nov  5 00:48:11 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Experimental bi-directionl protocol handler.               *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.5.2.2 $                                           *
  ***************************************************************************/
 
 
@@ -243,7 +243,7 @@
                     return JK_FALSE;
                 }
             } else if(!strcmp(header_name, "authorization")) {
-                *sc = SC_ACCEPT_LANGUAGE;
+                *sc = SC_AUTHORIZATION;
             } else {
                 return JK_FALSE;
             }
@@ -522,7 +522,7 @@
         return JK_FALSE;
     }
 
-    d->msg = jk_b_get_string(msg);
+    d->msg = (char *)jk_b_get_string(msg);
 
     jk_log(l, JK_LOG_DEBUG, 
            "ajp13_unmarshal_response: status = %d\n",
@@ -556,7 +556,7 @@
                         return JK_FALSE;
                     }
                 } else {
-                    d->header_names[i] = jk_b_get_string(msg);
+                    d->header_names[i] = (char *)jk_b_get_string(msg);
                     if(!d->header_names[i]) {
                         jk_log(l, JK_LOG_ERROR, 
                                "Error ajp13_unmarshal_response - Null header name\n");
@@ -565,7 +565,7 @@
                     }
                 }
 
-                d->header_values[i] = jk_b_get_string(msg);
+                d->header_values[i] = (char *)jk_b_get_string(msg);
                 if(!d->header_values[i]) {
                     jk_log(l, JK_LOG_ERROR, 
                            "Error ajp13_unmarshal_response - Null header value\n");
--- jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.h	Sat Aug 26 03:21:45 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_ajp13.h	Fri Jun 16 09:03:21 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Experimental bi-directionl protocol handler.               *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.3 $                                           *
  ***************************************************************************/
 #ifndef JK_AJP13_H
 #define JK_AJP13_H
--- jakarta-tomcat/src/native/mod_jk/common/jk_ajp13_worker.c	Sat Aug 26 03:21:45 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_ajp13_worker.c	Thu Sep 14 01:06:25 2000
@@ -57,7 +57,7 @@
  * Description: Experimental bi-directionl protocol.                       *
  * Author:      Costin <costin@costin.dnt.ro>                              *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.3.2.1 $                                           *
  ***************************************************************************/
 
 #include "jk_pool.h"
@@ -193,7 +193,7 @@
                                       jk_msg_buf_t *msg, 
                                       jk_logger_t *l) 
 {
-    char head[4];
+    unsigned char head[4];
     int rc;
     int msglen;
 
--- jakarta-tomcat/src/native/mod_jk/common/jk_connect.c	Sat Aug 26 03:21:45 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_connect.c	Thu Sep 14 01:06:25 2000
@@ -57,7 +57,7 @@
  * Description: Socket/Naming manipulation functions                       *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  * Based on:    Various Jserv files                                        *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2.2.1 $                                               *
  ***************************************************************************/
 
 
@@ -175,7 +175,7 @@
 
     while(sent < len) {
         int this_time = send(sd, 
-                             b + sent , 
+                             (char *)b + sent , 
                              len - sent, 
                              0);
 	    
@@ -199,7 +199,7 @@
 
     while(rdlen < len) {
 	    int this_time = recv(sd, 
-                             b + rdlen, 
+                             (char *)b + rdlen, 
                              len - rdlen, 
                              0);	
 	    if(-1 == this_time) {
--- jakarta-tomcat/src/native/mod_jk/common/jk_connect.h	Sat Aug 26 03:21:45 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_connect.h	Fri May 19 08:59:00 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Socket connections header file                             *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2 $                                               *
  ***************************************************************************/
 
 #ifndef JK_CONNECT_H
--- jakarta-tomcat/src/native/mod_jk/common/jk_global.h	Sat Aug 26 03:21:46 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_global.h	Thu Oct  5 08:35:57 2000
@@ -57,7 +57,7 @@
  * Description: Global definitions and include files that should exist     *
  *              anywhere                                                   *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2.2.2 $                                               *
  ***************************************************************************/
 
 #ifndef JK_GLOBAL_H
@@ -82,14 +82,16 @@
     #include <netdb.h>
 
     #include <netinet/in.h>
-    #include <netinet/tcp.h>
-    #include <arpa/inet.h>
-
-    #include <sys/un.h>
     #include <sys/socket.h>
+    #ifndef NETWARE
+        #include <netinet/tcp.h>
+        #include <arpa/inet.h>
+        #include <sys/un.h>
+        #include <sys/socketvar.h>
+        #include <sys/select.h>
+    #endif
+        
     #include <sys/time.h>
-    #include <sys/socketvar.h>
-    #include <sys/select.h>
     #include <sys/ioctl.h>
 #endif
 
@@ -115,7 +117,7 @@
 #define JK_SESSION_IDENTIFIER "JSESSIONID"
 #define JK_PATH_SESSION_IDENTIFIER ";jsessionid"
 
-#ifdef WIN32
+#if defined(WIN32) || defined(NETWARE)
     #define JK_METHOD __stdcall
     #define C_LEVEL_TRY_START       __try {
     #define C_LEVEL_TRY_END         }
--- jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c	Sat Aug 26 03:21:46 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_jni_worker.c	Thu Sep 14 01:06:25 2000
@@ -57,10 +57,10 @@
  * Description: In process JNI worker                                      *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  * Based on:                                                               *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.7.2.2 $                                           *
  ***************************************************************************/
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(NETWARE)
 #include <dlfcn.h>
 #endif
 
@@ -76,6 +76,11 @@
 #include <bits/signum.h>
 #endif
 
+#ifdef NETWARE
+#include <nwthread.h>
+#include <nwadv.h>
+#endif
+
 #ifndef JNI_VERSION_1_1
 #define JNI_VERSION_1_1 0x00010001
 #endif
@@ -353,11 +358,11 @@
         return JK_TRUE;
     }
 
-    if(jk_get_worker_mx(props, p->name, &mem_config)) {
+    if(jk_get_worker_mx(props, p->name, (unsigned int *)&mem_config)) {
         p->tomcat_mx = mem_config;
     }
 
-    if(jk_get_worker_ms(props, p->name, &mem_config)) {
+    if(jk_get_worker_ms(props, p->name, (unsigned int *)&mem_config)) {
         p->tomcat_ms = mem_config;
     }
 
@@ -691,6 +696,25 @@
         }
 
         FreeLibrary(hInst);
+    }
+#elif defined(NETWARE)
+    int javaNlmHandle = FindNLMHandle("JVM");
+    if (0 == javaNlmHandle) {
+        /* if we didn't get a handle, try to load java and retry getting the */
+        /* handle */
+        spawnlp(P_NOWAIT, "JVM.NLM", NULL);
+        ThreadSwitchWithDelay();
+        javaNlmHandle = FindNLMHandle("JVM");
+        if (0 == javaNlmHandle)
+            printf("Error loading Java.");
+
+    }
+    if (0 != javaNlmHandle) {
+        jni_create_java_vm = ImportSymbol(GetNLMHandle(), "JNI_CreateJavaVM");
+        jni_get_default_java_vm_init_args = ImportSymbol(GetNLMHandle(), "JNI_GetDefaultJavaVMInitArgs");
+    }
+    if(jni_create_java_vm && jni_get_default_java_vm_init_args) {
+        return JK_TRUE;
     }
 #else 
     void *handle;
--- jakarta-tomcat/src/native/mod_jk/common/jk_lb_worker.c	Sat Aug 26 03:21:46 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_lb_worker.c	Mon May 29 14:53:24 2000
@@ -58,7 +58,7 @@
  *              several workers.                                           *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
  * Based on:                                                               *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2 $                                               *
  ***************************************************************************/
 
 #include "jk_pool.h"
--- jakarta-tomcat/src/native/mod_jk/common/jk_map.c	Sat Aug 26 03:21:46 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_map.c	Wed May 31 13:24:03 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: General purpose map object                                 *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.3 $                                               *
  ***************************************************************************/
 
 #include "jk_global.h"
--- jakarta-tomcat/src/native/mod_jk/common/jk_msg_buff.c	Sat Aug 26 03:21:46 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_msg_buff.c	Thu Sep 14 01:06:26 2000
@@ -57,7 +57,7 @@
  * Description: Data marshaling. XDR like                                  *
  * Author:      Costin <costin@costin.dnt.ro>                              *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.2.2.1 $                                           *
  ***************************************************************************/
 
 #include "jk_pool.h"
@@ -189,7 +189,7 @@
     }
 
     msg->len = 0;
-    msg->buf = data;
+    msg->buf = (unsigned char *)data;
     msg->maxlen = buffSize;
     
     return 0;
@@ -205,7 +205,7 @@
 	    return -1;
     }
 
-    jk_b_set_buffer(msg, data, buffSize);
+    jk_b_set_buffer(msg, (char *)data, buffSize);
     return 0;
 }
 
@@ -260,7 +260,7 @@
     jk_b_append_int(msg, (unsigned short )len);
 
     /* We checked for space !!  */
-    strncpy(msg->buf + msg->len , param, len+1); /* including \0 */
+    strncpy((char *)msg->buf + msg->len , param, len+1); /* including \0 */
     msg->len += len + 1;
 
     return 0;
@@ -313,7 +313,7 @@
     if((size < 0 ) || (size + start > msg->maxlen)) { 
 	    jk_b_dump(msg, "After get int"); 
 	    printf("ERROR\n" );
-	    return "ERROR"; /* XXX */
+	    return (unsigned char *)"ERROR"; /* XXX */
     }
 
     msg->pos += size;
--- jakarta-tomcat/src/native/mod_jk/common/jk_msg_buff.h	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_msg_buff.h	Thu May 25 16:17:47 2000
@@ -57,7 +57,7 @@
  * Description: Data marshaling. XDR like                                  *
  * Author:      Costin <costin@costin.dnt.ro>                              *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.3 $                                           *
  ***************************************************************************/
 
 #ifndef JK_MSG_BUF_H
--- jakarta-tomcat/src/native/mod_jk/common/jk_nwmain.c	Thu Jan  1 01:00:00 1970
+++ jakarta-tomcat/src/native/mod_jk/common/jk_nwmain.c	Thu Oct  5 08:35:56 2000
@@ -0,0 +1,31 @@
+#ifdef NETWARE
+/*
+ * NATIVE_MAIN
+ */
+
+/*
+ * INCLUDES
+ */
+
+#include <stdio.h>
+#include <nwthread.h>
+#include <netdb.h>
+
+NETDB_DEFINE_CONTEXT
+
+/*
+ * main ()
+ *
+ * Main entry point -- don't do much more than I've provided
+ *
+ * Entry:
+ *
+ * Exit:
+ *    Nothing
+ */
+
+void main ()
+{
+   ExitThread (TSR_THREAD, 0);
+}
+#endif
--- jakarta-tomcat/src/native/mod_jk/common/jk_pool.h	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_pool.h	Thu Sep 14 01:06:27 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Memory Pool object header file                             *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2.2.2 $                                               *
  ***************************************************************************/
 #ifndef _JK_POOL_H
 #define _JK_POOL_H
@@ -88,6 +88,8 @@
 #elif defined(FREEBSD)
     typedef long long   jk_pool_atom_t;
 #elif defined(OS2)
+    typedef long long   jk_pool_atom_t;
+#elif defined(NETWARE)
     typedef long long   jk_pool_atom_t;
 #endif
 
--- jakarta-tomcat/src/native/mod_jk/common/jk_service.h	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_service.h	Fri Jun 23 12:34:04 2000
@@ -58,7 +58,7 @@
  *              These are the web server (ws) the worker and the connection*
  *              JVM connection point                                       *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.2 $                                               *
  ***************************************************************************/
 
 #ifndef JK_SERVICE_H
--- jakarta-tomcat/src/native/mod_jk/common/jk_sockbuf.c	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_sockbuf.c	Thu Sep 14 01:06:27 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Simple buffer object to handle buffered socket IO          *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.1.2.1 $                                               *
  ***************************************************************************/
 
 #include "jk_global.h"
@@ -90,7 +90,7 @@
                 return JK_FALSE;
             }
             if(sz > SOCKBUF_SIZE) {
-                return (send(sb->sd, buf, sz, 0) == (int)sz);
+                return (send(sb->sd, (char *)buf, sz, 0) == (int)sz);
             } 
             
             memcpy(sb->buf + sb->end, buf, sz);
--- jakarta-tomcat/src/native/mod_jk/common/jk_uri_worker_map.c	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_uri_worker_map.c	Mon May 29 14:53:24 2000
@@ -65,7 +65,7 @@
  * servlet container.                                                      *
  *                                                                         *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.3 $                                               *
  ***************************************************************************/
 
 #include "jk_pool.h"
--- jakarta-tomcat/src/native/mod_jk/common/jk_util.c	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_util.c	Thu Sep 14 01:06:27 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Utility functions (mainly configuration)                   *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.6.2.2 $                                               *
  ***************************************************************************/
 
 
@@ -108,9 +108,11 @@
 	    fflush(p->logfile);
 #ifndef WIN32
 #ifndef FREEBSD
+#ifndef NETWARE
 	    fdatasync(fileno(p->logfile));
 #endif
 #endif
+#endif
         }
 
         return JK_TRUE;
@@ -206,6 +208,8 @@
                        
 #ifdef WIN32
         used = _snprintf(buf, HUGE_BUFFER_SIZE, "[%s (%d)]: ", f, line);        
+#elif defined(NETWARE) // until we get a snprintf function
+        used = sprintf(buf, "[%s (%d)]: ", f, line);
 #else 
         used = snprintf(buf, HUGE_BUFFER_SIZE, "[%s (%d)]: ", f, line);        
 #endif
@@ -216,6 +220,8 @@
         va_start(args, fmt);
 #ifdef WIN32
         rc = _vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
+#elif defined(NETWARE) // until we get a vsnprintf function
+        rc = vsprintf(buf + used, fmt, args);
 #else 
         rc = vsnprintf(buf + used, HUGE_BUFFER_SIZE - used, fmt, args);
 #endif
--- jakarta-tomcat/src/native/mod_jk/common/jk_util.h	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_util.h	Fri Jun 23 12:34:08 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Various utility functions                                  *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                               *
+ * Version:     $Revision: 1.5 $                                               *
  ***************************************************************************/
 #ifndef _JK_UTIL_H
 #define _JK_UTIL_H
--- jakarta-tomcat/src/native/mod_jk/common/jk_worker.c	Sat Aug 26 03:21:47 2000
+++ jakarta-tomcat/src/native/mod_jk/common/jk_worker.c	Mon May 29 14:17:22 2000
@@ -56,7 +56,7 @@
 /***************************************************************************
  * Description: Workers controller                                         *
  * Author:      Gal Shachor <shachor@il.ibm.com>                           *
- * Version:     $Revision: 1.1 $                                           *
+ * Version:     $Revision: 1.5 $                                           *
  ***************************************************************************/
 
 #define _PLACE_WORKER_LIST_HERE

