svn commit: r1214679 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 15 09:59:58 2011 New Revision: 1214679 URL: http://svn.apache.org/viewvc?rev=1214679&view=rev Log: Votes Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214679&r1=1214678&r2=1214679&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 09:59:58 2011 @@ -31,7 +31,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1186763&view=rev Fix a typo in Windows uninstaller: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. - +1: kkolinko, rjung + +1: kkolinko, rjung, markt -1: * Make configuration issue for RemoteAddrValve, RemoteHostValve result @@ -75,7 +75,7 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:eol-style native connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties svn propset svn:eol-style native container/catalina/src/share/org/apache/catalina/filters/FailedRequestFilter.java svn propset svn:eol-style native container/webapps/docs/config/filter.xml - +1: kkolinko + +1: kkolinko, markt -1: * Clean up handling multi-byte chars in the connectors plus makin @@ -84,7 +84,7 @@ PATCHES PROPOSED TO BACKPORT: and r1201452 from TC 6. TC 6 patch applies with small offsets: http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch +1: rjung - +1: kkolinko (see 5.5 specific version below) + +1: kkolinko (see 5.5 specific version below), markt -1: kkolinko: 5.5 version of the above. No changes besides file paths and line numbers and absence of InternalNioOutputBuffer in TC55: @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: * Align %2f handling between implementations of UDecoder.convert() http://svn.apache.org/viewvc?rev=1203091&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Remove obsolete build.xml file that was used to download source tree. @@ -101,19 +101,19 @@ PATCHES PROPOSED TO BACKPORT: 1. svn del build/resources/build.xml 2. apply patch: http://people.apache.org/~kkolinko/patches/2011-11-15_tc55_build.patch - +1: kkolinko, rjung + +1: kkolinko, rjung, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225 Fix ClassCastException in Alias added for existing host via JMX http://svn.apache.org/viewvc?rev=1204856&view=rev (without tests; it is r1204860 in TC7) - +1: kkolinko + +1: kkolinko, markt -1: * Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. http://svn.apache.org/viewvc?rev=1206200&view=rev (without tests; it is r1206205 in TC7) - +1: kkolinko + +1: kkolinko, markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52328] Massive garbage production observed when using the response writer
https://issues.apache.org/bugzilla/show_bug.cgi?id=52328 Peter Wong changed: What|Removed |Added CC||peter.w...@fredhopper.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52335] Tomcat escapes all the \% in Template Text as %.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
--- Comment #1 from Konstantin Kolinko 2011-12-15
12:26:59 UTC ---
I agree that this is an issue.
The steps to reproduce, 7.0.23:
1. Create test.jsp containing the following line:
[[[ \% \\% <\% ]]]
2. Actual result:
The page is rendered as [[[ % \% <% ]]]
Expected result: [[[ \% \\% <% ]]]
I agree that I do not see provisions for escaping single '%' in the JSP Spec.
In JSP.1.3.10.1 EBNF Grammar (in JSP 2.2 Spec) defines template text as
[[[
TemplateText ::= ( ‘<‘ | ‘${‘ | ‘#{‘ )
| ( TemplateChar* -
( TemplateChar* ( ‘<‘ | ‘${‘ | ‘#{‘ ) ) )
TemplateChar ::= ‘\$’
| ‘\#’
| ‘<\%’
| Char
[ vc : QuotedDollarMatched ]
]]]
The ‘<\%’ is explicitly mentioned, but not '\%'.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214735 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: funkman Date: Thu Dec 15 12:50:25 2011 New Revision: 1214735 URL: http://svn.apache.org/viewvc?rev=1214735&view=rev Log: some votes Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214735&r1=1214734&r2=1214735&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 12:50:25 2011 @@ -42,7 +42,7 @@ PATCHES PROPOSED TO BACKPORT: It is based on r1189256 and r1187027, r1198622 (r1189258, r1187029, r1198623 in TC7) http://people.apache.org/~kkolinko/patches/2011-11-08_tc55_RequestFilterValve_v4.patch - +1: kkolinko + +1: kkolinko,funkman -1: kkolinko: It does its work and prevents app from starting and working. Though @@ -75,7 +75,7 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:eol-style native connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties svn propset svn:eol-style native container/catalina/src/share/org/apache/catalina/filters/FailedRequestFilter.java svn propset svn:eol-style native container/webapps/docs/config/filter.xml - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Clean up handling multi-byte chars in the connectors plus makin @@ -84,7 +84,7 @@ PATCHES PROPOSED TO BACKPORT: and r1201452 from TC 6. TC 6 patch applies with small offsets: http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch +1: rjung - +1: kkolinko (see 5.5 specific version below), markt + +1: kkolinko (see 5.5 specific version below), markt, funkman -1: kkolinko: 5.5 version of the above. No changes besides file paths and line numbers and absence of InternalNioOutputBuffer in TC55: @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: * Align %2f handling between implementations of UDecoder.convert() http://svn.apache.org/viewvc?rev=1203091&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Remove obsolete build.xml file that was used to download source tree. @@ -108,12 +108,12 @@ PATCHES PROPOSED TO BACKPORT: Fix ClassCastException in Alias added for existing host via JMX http://svn.apache.org/viewvc?rev=1204856&view=rev (without tests; it is r1204860 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. http://svn.apache.org/viewvc?rev=1206200&view=rev (without tests; it is r1206205 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50615] High count of Close_Wait
https://issues.apache.org/bugzilla/show_bug.cgi?id=50615 pranav.pr...@gmail.com changed: What|Removed |Added CC||pranav.pr...@gmail.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52341] New: Tomcat 6.0.32 Close_wait issue
https://issues.apache.org/bugzilla/show_bug.cgi?id=52341 Bug #: 52341 Summary: Tomcat 6.0.32 Close_wait issue Product: Tomcat 6 Version: 6.0.32 Platform: Sun OS/Version: Solaris Status: NEW Severity: regression Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: pranav.pr...@gmail.com Classification: Unclassified I am getting Close_wait issue on tomcat 6.0.32. Architecture we follow : Load balancer : Brocade ServerIron Server : 3 tomcat server all 6.0.32. Solaris server Scenario : Only an head request makes close_wait sessions. And which don't get killed and exists for long. Technology used inside web app : RestFul web service using Jersey, Apache axis 1.4 soap based to consume WS. jsp servlet., jdk 1.6.0.24 I also see some CLOSE_WAIT sessions for SSL sessions. We should never see this. XXX.225.8.152.443XXX.226.162.113.1034 65535 0 64240 0 CLOSE_WAIT XXX.225.8.152.443XX.219.4.45.1422 416096 0 65700 0 CLOSE_WAI -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: To developers I have some questions
Dear Mark Thank you for your answers!! I appreciated it very much. And Q1 is mistaken. I'm sorry... one more question is Q1 What is the most difficult point while developing tomcat? I look forward to receiving your reply. Ayame -- View this message in context: http://old.nabble.com/To-developers-I-have-some-questions-tp32955155p32981780.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 18 mins 46 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-15122011.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15122011-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-15122011-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-15122011.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/worksp ace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-15122011.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7. 0.x/tomcat-deps/tomcat-dbcp-15122011.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-15122011.jar:/srv/gump/public/workspace/junit/dist/junit-15122011.jar
DO NOT REPLY [Bug 52341] Tomcat 6.0.32 Close_wait issue
https://issues.apache.org/bugzilla/show_bug.cgi?id=52341 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2011-12-15 15:40:04 UTC --- This is something that is best discussed on the users list. It is not a bug. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214818 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/tomcat.nsi container/webapps/docs/changelog.xml
Author: markt Date: Thu Dec 15 15:56:38 2011 New Revision: 1214818 URL: http://svn.apache.org/viewvc?rev=1214818&view=rev Log: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Fix a typo in Windows uninstaller: Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/build/tomcat.nsi tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214818&r1=1214817&r2=1214818&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 15:56:38 2011 @@ -27,13 +27,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK/ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 - http://svn.apache.org/viewvc?rev=1186763&view=rev - Fix a typo in Windows uninstaller: - Do not forget to remove Tomcat keys from 32-bit registry on deinstallation. - +1: kkolinko, rjung, markt - -1: - * Make configuration issue for RemoteAddrValve, RemoteHostValve result in the failure of the valve rather than just a warning message. Ensure changes to the configuration of these valves via JMX are thread-safe. Modified: tomcat/tc5.5.x/trunk/build/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/tomcat.nsi?rev=1214818&r1=1214817&r2=1214818&view=diff == --- tomcat/tc5.5.x/trunk/build/tomcat.nsi (original) +++ tomcat/tc5.5.x/trunk/build/tomcat.nsi Thu Dec 15 15:56:38 2011 @@ -1134,7 +1134,7 @@ Section Uninstall ; Don't know if 32-bit or 64-bit registry was used so, for now, remove both SetRegView 32 DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Apache Tomcat @VERSION_MAJOR_MINOR@ $TomcatServiceName" - DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@ $TomcatServiceName" + DeleteRegKey HKLM "SOFTWARE\Apache Software Foundation\Tomcat\@VERSION_MAJOR_MINOR@\$TomcatServiceName" DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName" SetRegView 64 Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1214818&r1=1214817&r2=1214818&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Dec 15 15:56:38 2011 @@ -37,7 +37,7 @@ @@ -60,6 +60,14 @@ + + + +52059: Ensure Windows registry keys are removed when using +the un-install option of the Windows installer. (markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52059] Windows Registry are not removed after uninstall
https://issues.apache.org/bugzilla/show_bug.cgi?id=52059 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Comment #6 from Mark Thomas 2011-12-15 15:57:35 UTC --- Fixed in 5.5.x and will be included in 5.5.35 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214853 - /tomcat/trunk/test/webapp-3.0/bug36923.jsp
Author: markt
Date: Thu Dec 15 16:49:10 2011
New Revision: 1214853
URL: http://svn.apache.org/viewvc?rev=1214853&view=rev
Log:
Fix copy/paste error
Modified:
tomcat/trunk/test/webapp-3.0/bug36923.jsp
Modified: tomcat/trunk/test/webapp-3.0/bug36923.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug36923.jsp?rev=1214853&r1=1214852&r2=1214853&view=diff
==
--- tomcat/trunk/test/webapp-3.0/bug36923.jsp (original)
+++ tomcat/trunk/test/webapp-3.0/bug36923.jsp Thu Dec 15 16:49:10 2011
@@ -16,7 +16,7 @@
--%>
<%@ page isELIgnored="true" %>
- Bug 44994 test case
+ Bug 36923 test case
00-${<%= "hello world" %>}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214854 - in /tomcat/tc7.0.x/trunk: ./ test/webapp-3.0/bug36923.jsp
Author: markt Date: Thu Dec 15 16:49:49 2011 New Revision: 1214854 URL: http://svn.apache.org/viewvc?rev=1214854&view=rev Log: Fix coop/paste error Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/test/webapp-3.0/bug36923.jsp Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 15 16:49:49 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,11751
svn commit: r1214855 - in /tomcat/trunk: java/org/apache/jasper/compiler/Parser.java test/org/apache/jasper/compiler/TestParser.java test/webapp-3.0/bug52335.jsp
Author: markt
Date: Thu Dec 15 16:50:25 2011
New Revision: 1214855
URL: http://svn.apache.org/viewvc?rev=1214855&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
% is only escaped as <\%, not \%
Added:
tomcat/trunk/test/webapp-3.0/bug52335.jsp
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/test/org/apache/jasper/compiler/TestParser.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=1214855&r1=1214854&r2=1214855&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Thu Dec 15
16:50:25 2011
@@ -1278,7 +1278,7 @@ class Parser implements TagConstants {
/*
* Parse for a template text string until '<' or "${" or "#{" is
encountered,
- * recognizing escape sequences "\%", "\$", and "\#".
+ * recognizing escape sequences "<\%", "\$", and "\#".
*/
private void parseTemplateText(Node parent) throws JasperException {
@@ -1297,8 +1297,33 @@ class Parser implements TagConstants {
while (reader.hasMoreInput()) {
ch = reader.nextChar();
if (ch == '<') {
-reader.pushChar();
-break;
+// 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;
+}
} else if ((ch == '$' || ch == '#') && !pageInfo.isELIgnored()) {
if (!reader.hasMoreInput()) {
ttext.write(ch);
@@ -1318,9 +1343,9 @@ class Parser implements TagConstants {
break;
}
char next = (char) reader.peekChar();
-// Looking for \% or \$ or \#
-if (next == '%' || ((next == '$' || next == '#') &&
-!pageInfo.isELIgnored())) {
+// Looking for \$ or \# when EL is being used
+if ((next == '$' || next == '#') &&
+!pageInfo.isELIgnored()) {
ch = reader.nextChar();
}
}
Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1214855&r1=1214854&r2=1214855&view=diff
==
--- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Thu Dec 15
16:50:25 2011
@@ -290,6 +290,26 @@ public class TestParser extends TomcatBa
assertEcho(res.toString(), "OK");
}
+@Test
+public void testBug52335() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir =
+new File("test/webapp-3.0");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/bug52335.jsp");
+
+String result = res.toString();
+// Beware of the differences between escaping in JSP attributes and
+// in Java Strings
+assertEcho(result, "00 - \\% % <\\%");
+}
+
/** Assertion for text printed by tags:echo */
private static void assertEcho(String result, String expected) {
assertTrue(result.indexOf("" + expected + "") > 0);
Added: tomcat/trunk/test/webapp-3.0/bug52335.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug52335.jsp?rev=1214855&view=auto
==
--- tomcat/trunk/test/webapp-3.0/bug52335.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug52335.jsp Thu Dec 15 16:50:25 2011
@@ -0,0 +1,24 @@
+<%--
+ Licensed to the Apache Software Foundation (A
svn commit: r1214864 - /tomcat/trunk/test/webapp-3.0/bug52335.jsp
Author: markt Date: Thu Dec 15 17:03:48 2011 New Revision: 1214864 URL: http://svn.apache.org/viewvc?rev=1214864&view=rev Log: Fix eol Modified: tomcat/trunk/test/webapp-3.0/bug52335.jsp (props changed) Propchange: tomcat/trunk/test/webapp-3.0/bug52335.jsp -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/2574 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1214864 Blamelist: markt Build succeeded! sincerely, -The Buildbot
svn commit: r1214922 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/Parser.java test/org/apache/jasper/compiler/TestParser.java test/webapp-3.0/bug52335.jsp webapps/docs/changelog.xml
Author: markt Date: Thu Dec 15 19:28:51 2011 New Revision: 1214922 URL: http://svn.apache.org/viewvc?rev=1214922&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 % is only escaped as <\%, not \% Added: tomcat/tc7.0.x/trunk/test/webapp-3.0/bug52335.jsp (props changed) - copied unchanged from r1214855, tomcat/trunk/test/webapp-3.0/bug52335.jsp Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Parser.java tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 15 19:28:51 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 753,1187755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1198696,1198707,1199418,1199432,1199436,1199513,1199529,1199980,116,1200056,1200089,1200106-1200107,1200263,1200316,1200320,1200398-1200399,1200445-1200446,1200555,1200627,1200696,1200725,1200937,1200941,1201069,1201087,1201180,1201235-1201237,1201508,1201521,1201542,1201545-1201546,1201548,1201555-1201556,1201568,1201576,1201608,1201921-1201922,1201931,1 202035,1202039,1202271,1202565,1202578,1202705,1202828,1202860,1203047-1203052,1203078,1203091,1203253,1203278,1204182,1204856,1204867,1204936,1204938,1204982,1205033,1205065,1205082,1205097,1205112,1206200,1207692,1208046,1208073,1208096,1208114,1208145,1208772,1209194,1209277-1209278,1209686-1209731,1210894,1212091,1212095,1212099,1212118,1213469,1213906,1214853 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1
svn commit: r1214923 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: markt Date: Thu Dec 15 19:30:05 2011 New Revision: 1214923 URL: http://svn.apache.org/viewvc?rev=1214923&view=rev Log: Better description Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1214923&r1=1214922&r2=1214923&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Dec 15 19:30:05 2011 @@ -97,8 +97,8 @@ for JSP pages is respected. (markt) -52335: Correctly escape <\% sequences and do -not escape \% sequences in template text. (markt) +52335: Only handle <\% and not +\% as escaped in template text. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214924 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 15 19:30:54 2011 New Revision: 1214924 URL: http://svn.apache.org/viewvc?rev=1214924&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1214924&r1=1214923&r2=1214924&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 15 19:30:54 2011 @@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: I tested only that it does not break things with the current released tcnative version 1.1.22 that does not have FIPS mode support. http://people.apache.org/~kkolinko/patches/2011-11-12_tc6_AprLifecycleListener.patch - +1: kkolinko + +1: kkolinko, markt -1: * Fix autodeployment of applications that have configuration errors. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214925 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 15 19:32:20 2011 New Revision: 1214925 URL: http://svn.apache.org/viewvc?rev=1214925&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1214925&r1=1214924&r2=1214925&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 15 19:32:20 2011 @@ -137,6 +137,12 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: In description of jarFileDir attribute: s/if not same as artifactId/if not same as tomcat.lib.path/ +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 + Only handle <\% and not \% as escaped in template text. + http://svn.apache.org/viewvc?rev=1214855&view=rev + +1: markt + -1: + PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1214926 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Thu Dec 15 19:33:51 2011 New Revision: 1214926 URL: http://svn.apache.org/viewvc?rev=1214926&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214926&r1=1214925&r2=1214926&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 19:33:51 2011 @@ -110,3 +110,9 @@ PATCHES PROPOSED TO BACKPORT: (without tests; it is r1206205 in TC7) +1: kkolinko, markt,funkman -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 + Only handle <\% and not \% as escaped in template text. + http://svn.apache.org/viewvc?rev=1214855&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52335] Tomcat escapes all the \% in Template Text as %.
https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 --- Comment #2 from Mark Thomas 2011-12-15 19:34:14 UTC --- Fixed in trunk and 7.0.x and will be included in 7.0.24 onwards. Proposed for 6.0.x and 5.5.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1214855 - in /tomcat/trunk: java/org/apache/jasper/compiler/Parser.java test/org/apache/jasper/compiler/TestParser.java test/webapp-3.0/bug52335.jsp
1. The test & fix is wrong.
<\% should print <%
2. Note " // Output the first character" comment in parseTemplateText().
That is special handling of the first character.
My understanding of the code before this change is that
the loop in parseTemplateText() always breaks when '<' is encountered.
I think that when that '<' is not start of a tag and similar, then
parseTemplateText() is just called again.
On this second call the '<' will be the first character and that is
why it is handled specially before the loop.
(That is just from code review. I have not tried to debug it yet).
Best regards,
Konstantin Kolinko
2011/12/15 :
> Author: markt
> Date: Thu Dec 15 16:50:25 2011
> New Revision: 1214855
>
> URL: http://svn.apache.org/viewvc?rev=1214855&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
> % is only escaped as <\%, not \%
>
> Added:
> tomcat/trunk/test/webapp-3.0/bug52335.jsp
> Modified:
> tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
> tomcat/trunk/test/org/apache/jasper/compiler/TestParser.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=1214855&r1=1214854&r2=1214855&view=diff
> ==
> --- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
> +++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Thu Dec 15
> 16:50:25 2011
> @@ -1278,7 +1278,7 @@ class Parser implements TagConstants {
>
> /*
> * Parse for a template text string until '<' or "${" or "#{" is
> encountered,
> - * recognizing escape sequences "\%", "\$", and "\#".
> + * recognizing escape sequences "<\%", "\$", and "\#".
> */
> private void parseTemplateText(Node parent) throws JasperException {
>
> @@ -1297,8 +1297,33 @@ class Parser implements TagConstants {
> while (reader.hasMoreInput()) {
> ch = reader.nextChar();
> if (ch == '<') {
> - reader.pushChar();
> - break;
> + // 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;
> + }
> } else if ((ch == '$' || ch == '#') && !pageInfo.isELIgnored()) {
> if (!reader.hasMoreInput()) {
> ttext.write(ch);
> @@ -1318,9 +1343,9 @@ class Parser implements TagConstants {
> break;
> }
> char next = (char) reader.peekChar();
> - // Looking for \% or \$ or \#
> - if (next == '%' || ((next == '$' || next == '#') &&
> - !pageInfo.isELIgnored())) {
> + // Looking for \$ or \# when EL is being used
> + if ((next == '$' || next == '#') &&
> + !pageInfo.isELIgnored()) {
> ch = reader.nextChar();
> }
> }
>
> Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1214855&r1=1214854&r2=1214855&view=diff
> ==
> --- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java (original)
> +++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Thu Dec 15
> 16:50:25 2011
> @@ -290,6 +290,26 @@ public class TestParser extends TomcatBa
> assertEcho(res.toString(), "OK");
> }
>
> + @Test
> + public void testBug52335() throws Exception {
> + Tomcat tomcat = getTomcatInstance();
> +
> + File appDir =
> + new File("test/webapp-3.0");
> + // app dir is relative to server home
> + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
> +
> + tomcat.start();
> +
> + ByteChunk res = getUrl("http://localhost:"; + getPort() +
> + "/test/bug52335.
Re: svn commit: r1214855 - in /tomcat/trunk: java/org/apache/jasper/compiler/Parser.java test/org/apache/jasper/compiler/TestParser.java test/webapp-3.0/bug52335.jsp
Konstantin Kolinko wrote:
>1. The test & fix is wrong.
><\% should print <%
>
>2. Note " // Output the first character" comment in
>parseTemplateText().
>That is special handling of the first character.
>
>My understanding of the code before this change is that
>the loop in parseTemplateText() always breaks when '<' is encountered.
>
>I think that when that '<' is not start of a tag and similar, then
>parseTemplateText() is just called again.
>On this second call the '<' will be the first character and that is
>why it is handled specially before the loop.
>(That is just from code review. I have not tried to debug it yet).
>
>Best regards,
>Konstantin Kolinko
>
>
>2011/12/15 :
>> Author: markt
>> Date: Thu Dec 15 16:50:25 2011
>> New Revision: 1214855
>>
>> URL: http://svn.apache.org/viewvc?rev=1214855&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335
>> % is only escaped as <\%, not \%
>>
>> Added:
>> tomcat/trunk/test/webapp-3.0/bug52335.jsp
>> Modified:
>> tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
>> tomcat/trunk/test/org/apache/jasper/compiler/TestParser.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=1214855&r1=1214854&r2=1214855&view=diff
>>
>==
>> --- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
>(original)
>> +++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Thu Dec
>15 16:50:25 2011
>> @@ -1278,7 +1278,7 @@ class Parser implements TagConstants {
>>
>> /*
>> * Parse for a template text string until '<' or "${" or "#{" is
>encountered,
>> - * recognizing escape sequences "\%", "\$", and "\#".
>> + * recognizing escape sequences "<\%", "\$", and "\#".
>> */
>> private void parseTemplateText(Node parent) throws
>JasperException {
>>
>> @@ -1297,8 +1297,33 @@ class Parser implements TagConstants {
>> while (reader.hasMoreInput()) {
>> ch = reader.nextChar();
>> if (ch == '<') {
>> - reader.pushChar();
>> - break;
>> + // 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;
>> + }
>> } else if ((ch == '$' || ch == '#') &&
>!pageInfo.isELIgnored()) {
>> if (!reader.hasMoreInput()) {
>> ttext.write(ch);
>> @@ -1318,9 +1343,9 @@ class Parser implements TagConstants {
>> break;
>> }
>> char next = (char) reader.peekChar();
>> - // Looking for \% or \$ or \#
>> - if (next == '%' || ((next == '$' || next == '#') &&
>> - !pageInfo.isELIgnored())) {
>> + // Looking for \$ or \# when EL is being used
>> + if ((next == '$' || next == '#') &&
>> + !pageInfo.isELIgnored()) {
>> ch = reader.nextChar();
>> }
>> }
>>
>> Modified:
>tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
>> URL:
>http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java?rev=1214855&r1=1214854&r2=1214855&view=diff
>>
>==
>> --- tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java
>(original)
>> +++ tomcat/trunk/test/org/apache/jasper/compiler/TestParser.java Thu
>Dec 15 16:50:25 2011
>> @@ -290,6 +290,26 @@ public class TestParser extends TomcatBa
>> assertEcho(res.toString(), "OK");
>> }
>>
>> + @Test
>> + public void testBug52335() throws Exception {
>> + Tomcat tomcat = getTomcatInstance();
>> +
>> + File appDir =
>> + new File("test/webapp-3.0");
>> + // app dir is relative to server home
>> + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()
