RE: [PATCH] for NetWare
You can use : cat patch | tr -d '\015' > patch.nodos will remove the dreaded CR On ne peut résoudre les problèmes les plus graves avec le même esprit qui les a crées. -- Albert Einstein >-Original Message- >From: Dan Milstein [mailto:[EMAIL PROTECTED]] >Sent: Friday, February 02, 2001 5:01 PM >To: [EMAIL PROTECTED]; Mike Anderson >Subject: Re: [PATCH] for NetWare > > >Mike, > >I just tried to apply your fixes, and I'm totally failing -- >the local diff >command isn't recognizing the files as being at all similar >(despite the >fact that they look similar on visual inspection). > >I have a *very* strong suspicion that this has to do with line-ending >characters. It looks like you are using a non-Unix system, >which I am going >to guess has a different convention for line-endings. The cvs >client will >magically fix this when you check files out and check them in (i.e. it >translates non-Unix to Unix conventions transparently). So a >'cvs diff -u' >should probably work, but, when you email me your checked out >copy, it's got >non-Unix line endings, so when I try to diff it against the copy I've >checked out on my Linux box, diff thinks that every line is different. > >Short version: can you email me patches generated from 'cvs >diff -u'? I'm >fairly certain I can get those to work. > >Thanks, >-Dan >-- > >Dan Milstein // [EMAIL PROTECTED] > > >Mike Anderson wrote: >> >> 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 >> >> >--- >- >> >>diff.txtName: diff.txt >>Type: Plain Text (text/plain) >> >> Name: jk_util.c >>jk_util.cType: unspecified type (application/octet-stream) >> Encoding: base64 >> >> Name: jk_nsapi_plugin.c >>jk_nsapi_plugin.cType: unspecified type >(application/octet-stream) >> Encoding: base64 >> >> Name: ApacheConfig.java >>ApacheConfig.javaType: unspecified type >(application/octet-stream) >> Encoding: base64 >> >> >--- >- >> - >> To unsubscribe, e-mail: [EMAIL PROTECTED] >> For additional commands, email: [EMAIL PROTECTED] > >-- > >Dan Milstein // [EMAIL PROTECTED] > >- >To unsubscribe, e-mail: [EMAIL PROTECTED] >For additional commands, email: [EMAIL PROTECTED] > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: [PATCH] for NetWare
Mike, I just tried to apply your fixes, and I'm totally failing -- the local diff command isn't recognizing the files as being at all similar (despite the fact that they look similar on visual inspection). I have a *very* strong suspicion that this has to do with line-ending characters. It looks like you are using a non-Unix system, which I am going to guess has a different convention for line-endings. The cvs client will magically fix this when you check files out and check them in (i.e. it translates non-Unix to Unix conventions transparently). So a 'cvs diff -u' should probably work, but, when you email me your checked out copy, it's got non-Unix line endings, so when I try to diff it against the copy I've checked out on my Linux box, diff thinks that every line is different. Short version: can you email me patches generated from 'cvs diff -u'? I'm fairly certain I can get those to work. Thanks, -Dan -- Dan Milstein // [EMAIL PROTECTED] Mike Anderson wrote: > > 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 > > > >diff.txtName: diff.txt >Type: Plain Text (text/plain) > > Name: jk_util.c >jk_util.cType: unspecified type (application/octet-stream) > Encoding: base64 > > Name: jk_nsapi_plugin.c >jk_nsapi_plugin.cType: unspecified type (application/octet-stream) > Encoding: base64 > > Name: ApacheConfig.java >ApacheConfig.javaType: unspecified type (application/octet-stream) > Encoding: base64 > > > - > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, email: [EMAIL PROTECTED] -- Dan Milstein // [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
[PATCH] for NetWare
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]
