Author: markt
Date: Wed Jul 30 13:17:03 2008
New Revision: 681192
URL: http://svn.apache.org/viewvc?rev=681192&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
Prevent collisions in tag pool names
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=681192&r1=681191&r2=681192&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 30 13:17:03 2008
@@ -88,6 +88,9 @@
<fix>
<bug>31257</bug>: Quote endorsed dirs if they contain a space. (markt)
</fix>
+ <fix>
+ <bug>44877</bug>: Prevent collisions in tag pool names. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=681192&r1=681191&r2=681192&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 30 13:17:03 2008
@@ -86,12 +86,6 @@
+1: markt, yoavs
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44877
- Prevent collisions in tag pool names
- http://svn.apache.org/viewvc?rev=651984&view=rev
- +1: markt, fhanik, yoavs
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
No way to turn off compression for some MIME types
Based on a patch by Len Popp
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?rev=681192&r1=681191&r2=681192&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Wed Jul 30 13:17:03 2008
@@ -262,6 +262,9 @@
attrNames[i] = attrs.getQName(i);
}
Arrays.sort(attrNames, Collections.reverseOrder());
+ if (attrNames.length > 0) {
+ poolName = poolName + "&";
+ }
for (int i = 0; i < attrNames.length; i++) {
poolName = poolName + "_" + attrNames[i];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
