Attached are some patched files and a diff file for NetWare. These have been diffed
against the latest version in the jakarta-tomcat tree. The jk_util.c and
jk_nsapi_plugin.c are the same fixes that have been put into the tomcat-32 branch and
I will submit the ApacheConf.java to the tomcat-32 branch as well.
diff.txt - diffs of the files
jk_util.c - Fixes a problem when shutting down the webserver on NetWare. The exit
thread only has a 16k stack so we dynamically allocate the log buffer so that we don't
blow the stack.
jk_nsapi_plugin.c - Fixes a problem with the netbuf_getbytes function not being
available on NetWare 5.x.
ApacheConfig.java - Updated to write a correct mod_jk.conf-auto for NetWare.
Thanks
Mike Anderson
Senior Software Engineer
Platform Services Group
[EMAIL PROTECTED]
Novell, Inc., the leading provider of Net services software
www.novell.com
cvs -z9 -q diff jk_nsapi_plugin.c (in directory
D:\Jakarta-3.3\jakarta-tomcat\src\native\mod_jk\netscape\)
Index: jk_nsapi_plugin.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat/src/native/mod_jk/netscape/jk_nsapi_plugin.c,v
retrieving revision 1.1
diff -r1.1 jk_nsapi_plugin.c
191c191,193
< #ifdef netbuf_getbytes
---
> /* Until we get a service pack for NW5.1 and earlier that has the latest */
> /* Enterprise Server, we have to go through the else version of this code*/
> #if defined(netbuf_getbytes) && !defined(NETWARE)
cvs -z9 -q diff jk_util.c (in directory
D:\Jakarta-3.3\jakarta-tomcat\src\native\mod_jk\common\)
Index: jk_util.c
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat/src/native/mod_jk/common/jk_util.c,v
retrieving revision 1.2
diff -r1.2 jk_util.c
196a197,201
> #ifdef NETWARE
> /* On NetWare, this can get called on a thread that has a limited stack so */
> /* we will allocate and free the temporary buffer in this function */
> char *buf;
> #else
197a203
> #endif
211a218,221
> buf = (char *) malloc(HUGE_BUFFER_SIZE);
> if (NULL == buf)
> return -1;
>
229a240,242
> #ifdef NETWARE
> free(buf);
> #endif
cvs -z9 -q diff ApacheConfig.java (in directory
D:\Jakarta-3.3\jakarta-tomcat\src\share\org\apache\tomcat\modules\config\)
Index: ApacheConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ApacheConfig.java,v
retrieving revision 1.2
diff -r1.2 ApacheConfig.java
124a125,131
> } else if( System.getProperty( "os.name" ).startsWith("NetWare")) {
> // NetWare is a special case
> pw.println("LoadModule jserv_module modules/JServ.nlm");
> mod_jk.println("LoadModule jk_module modules/mod_jk.nlm");
> mod_jk.println();
> mod_jk.println("JkWorkersFile \"" + new File(tomcatHome,
>WORKERS_CONFIG).toString().replace('\\', '/') + "\"");
> mod_jk.println("JkLogFile \"" + new File(tomcatHome,
>JK_LOG_LOCATION).toString().replace('\\', '/') + "\"");
jk_util.c
jk_nsapi_plugin.c
ApacheConfig.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
