Author: markt
Date: Fri Dec 16 13:13:00 2011
New Revision: 1215119
URL: http://svn.apache.org/viewvc?rev=1215119&view=rev
Log:
Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1215119&r1=1215118&r2=1215119&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Fri Dec 16
13:13:00 2011
@@ -1297,33 +1297,8 @@ class Parser implements TagConstants {
while (reader.hasMoreInput()) {
ch = reader.nextChar();
if (ch == '<') {
- // Check for <\%
- ch = reader.nextChar();
- if (ch == -1) {
- reader.pushChar();
- break;
- } else if (ch == '\\') {
- ch = reader.nextChar();
- if (ch == -1) {
- reader.pushChar();
- reader.pushChar();
- break;
- } else if (ch == '%') {
- ttext.write('<');
- ttext.write('\\');
- ttext.write('%');
- continue;
- } else {
- reader.pushChar();
- reader.pushChar();
- reader.pushChar();
- break;
- }
- } else {
- reader.pushChar();
- reader.pushChar();
- break;
- }
+ reader.pushChar();
+ break;
} else if ((ch == '$' || ch == '#') && !pageInfo.isELIgnored()) {
if (!reader.hasMoreInput()) {
ttext.write(ch);
@@ -1343,9 +1318,9 @@ class Parser implements TagConstants {
break;
}
char next = (char) reader.peekChar();
- // Looking for \$ or \# when EL is being used
- if ((next == '$' || next == '#') &&
- !pageInfo.isELIgnored()) {
+ // Looking for \% or \$ or \#
+ if (next == '%' || ((next == '$' || next == '#') &&
+ !pageInfo.isELIgnored())) {
ch = reader.nextChar();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
