Author: markt
Date: Thu Apr 17 10:55:30 2008
New Revision: 649207
URL: http://svn.apache.org/viewvc?rev=649207&view=rev
Log:
Fix bug 44391. Correct handling of escaped values in SSI processing.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=649207&r1=649206&r2=649207&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Apr 17 10:55:30 2008
@@ -64,9 +64,3 @@
http://svn.apache.org/viewvc?view=rev&revision=645428
+1: jfclere, rjung, fhanik, remm
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44391
- Handling of escaped characters was incorrect.
- http://svn.apache.org/viewvc?rev=647316&view=rev
- +1: markt, remm, fhanik
- -1:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java?rev=649207&r1=649206&r2=649207&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ssi/SSIProcessor.java Thu Apr
17 10:55:30 2008
@@ -208,11 +208,10 @@
// Need to skip escaped characters
if (c == '\\' && !escaped) {
escaped = true;
- bIdx++;
continue;
}
+ if (c == '"' && !escaped) quotes++;
escaped = false;
- if (c == '"') quotes++;
}
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=649207&r1=649206&r2=649207&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Apr 17 10:55:30 2008
@@ -117,6 +117,10 @@
Caldarale. (markt/jim)
</fix>
<fix>
+ <bug>44391</bug>: Correct handling of escaped values in SSI processing.
+ (markt)
+ </fix>
+ <fix>
<bug>44392</bug>: HTML entities now handled correctly in SSI
processing.
(markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
