funkman 2004/09/01 09:31:02 Modified: catalina/src/share/org/apache/catalina Tag: TOMCAT_5_0 Globals.java catalina/src/share/org/apache/catalina/ssi Tag: TOMCAT_5_0 ByteArrayServletOutputStream.java ResponseIncludeWrapper.java SSICommand.java SSIConfig.java SSIEcho.java SSIExec.java SSIExternalResolver.java SSIFlastmod.java SSIFsize.java SSIInclude.java SSIMediator.java SSIPrintenv.java SSIProcessor.java SSIServlet.java SSIServletExternalResolver.java SSIServletRequestUtil.java SSISet.java SSIStopProcessingException.java Log: Backport from 4.1 to get if else logic. Revision Changes Path No revision No revision 1.9.2.1 +29 -18 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java.diff?r1=1.9&r2=1.9.2.1 No revision No revision 1.3.2.1 +26 -27 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ByteArrayServletOutputStream.java.diff?r1=1.3&r2=1.3.2.1 1.4.2.1 +57 -57 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ResponseIncludeWrapper.java.diff?r1=1.4&r2=1.4.2.1 1.3.2.1 +29 -28 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSICommand.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSICommand.java.diff?r1=1.3&r2=1.3.2.1 1.3.2.1 +34 -40 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConfig.java.diff?r1=1.3&r2=1.3.2.1 1.2.2.1 +44 -53 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIEcho.java.diff?r1=1.2&r2=1.2.2.1 1.3.2.1 +49 -55 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExec.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExec.java.diff?r1=1.3&r2=1.3.2.1 1.3.2.1 +46 -39 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIExternalResolver.java.diff?r1=1.3&r2=1.3.2.1 1.3.2.1 +47 -52 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFlastmod.java.diff?r1=1.3&r2=1.3.2.1 1.2.2.1 +76 -82 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIFsize.java.diff?r1=1.2&r2=1.2.2.1 1.3.2.1 +39 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIInclude.java.diff?r1=1.3&r2=1.3.2.1 1.3.2.1 +258 -176 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIMediator.java.diff?r1=1.3&r2=1.3.2.1 1.2.2.1 +36 -43 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIPrintenv.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIPrintenv.java.diff?r1=1.2&r2=1.2.2.1 1.3.2.1 +224 -193 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIProcessor.java.diff?r1=1.3&r2=1.3.2.1 1.6.2.2 +87 -99 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServlet.java.diff?r1=1.6.2.1&r2=1.6.2.2 1.3.2.1 +379 -356 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletExternalResolver.java.diff?r1=1.3&r2=1.3.2.1 1.2.2.1 +39 -50 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIServletRequestUtil.java.diff?r1=1.2&r2=1.2.2.1 1.2.2.1 +39 -45 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSISet.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSISet.java.diff?r1=1.2&r2=1.2.2.1 1.2.2.1 +16 -18 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIStopProcessingException.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIStopProcessingException.java.diff?r1=1.2&r2=1.2.2.1
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]