Yay! My code is back. :) -Paul
[EMAIL PROTECTED] wrote:
funkman 2004/09/01 11:33:34
Modified: catalina/src/share/org/apache/catalina Globals.java
catalina/src/share/org/apache/catalina/ssi
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
Added: catalina/src/share/org/apache/catalina/ssi
ExpressionParseTree.java ExpressionTokenizer.java
SSIConditional.java SSIConditionalState.java
Log:
Backport from 4.1 the ssi if else logic
Revision Changes Path
1.11 +12 -1 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.10&r2=1.11
1.5 +23 -21 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.4&r2=1.5
1.5 +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.5
1.4 +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.4
1.4 +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.4
1.3 +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.3
1.4 +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.4
1.4 +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.4
1.4 +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.4
1.3 +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.3
1.4 +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.4
1.4 +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.4
1.3 +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.3
1.4 +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.4
1.8 +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.7&r2=1.8
1.4 +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.4
1.3 +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.3
1.3 +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.3
1.3 +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.3
1.2 +383 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ExpressionParseTree.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ExpressionParseTree.java.diff?r1=1.1&r2=1.2
1.2 +171 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ExpressionTokenizer.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/ExpressionTokenizer.java.diff?r1=1.1&r2=1.2
1.2 +129 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConditional.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConditional.java.diff?r1=1.1&r2=1.2
1.2 +38 -0 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConditionalState.java
http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ssi/SSIConditionalState.java.diff?r1=1.1&r2=1.2
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
