Author: markt
Date: Fri May 22 15:46:17 2009
New Revision: 777586
URL: http://svn.apache.org/viewvc?rev=777586&view=rev
Log:
Revert patch for 42390. More tetsing required.
Modified:
tomcat/current/tc5.5.x/STATUS.txt
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=777586&r1=777585&r2=777586&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Fri May 22 15:46:17 2009
@@ -245,14 +245,6 @@
+1: markt, rjung, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
- Correct JSP compilation error with nested tagfile tags with variables with
- "AT_BEGIN" scope
- Patch provided by Konstantin Kolinko
- http://svn.apache.org/viewvc?rev=763717&view=rev
- +1: markt
- -1: kkolinko: http://svn.apache.org/viewvc?rev=776523&view=rev
-
* Update native to 1.1.16
http://svn.apache.org/viewvc?view=rev&revision=762868
+1: markt, rjung, kkolinko
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=777586&r1=777585&r2=777586&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 22 15:46:17 2009
@@ -84,7 +84,6 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46985
Clean up timeout handling
http://svn.apache.org/viewvc?rev=763262&view=rev
- http://svn.apache.org/viewvc?rev=777576&view=rev
+1: markt, pero
-1: kkolinko:
It looks like it fixes not bug 46985, but some other issue.
@@ -107,17 +106,6 @@
+1: kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
- Correct JSP compilation error with nested tagfile tags with variables with
- "AT_BEGIN" scope
- Patch provided by Konstantin Kolinko
- http://svn.apache.org/viewvc?rev=763717&view=rev
- +1: markt, remm (risky ...)
- -1: kkolinko: sorry, but it looks like I have to revoke my own patch
- At very least: it is, indeed, risky: it changes behavior both for
- SimpleTags and Tags, but only SimpleTags were reported to be broken.
- It will need more testing.
-
* Fix use of non-ASCII characters in property files
http://people.apache.org/~markt/patches/2009-04-20-native2ascii-de.patch
(German)
http://people.apache.org/~markt/patches/2009-04-20-native2ascii-en.patch
(English)
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java?rev=777586&r1=777585&r2=777586&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ScriptingVariabler.java Fri
May 22 15:46:17 2009
@@ -68,7 +68,7 @@
public void visit(Node.CustomTag n) throws JasperException {
setScriptingVars(n, VariableInfo.AT_BEGIN);
setScriptingVars(n, VariableInfo.NESTED);
- new ScriptingVariableVisitor(err).visitBody(n);
+ visitBody(n);
setScriptingVars(n, VariableInfo.AT_END);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
