Author: markt
Date: Tue Oct 21 20:33:51 2014
New Revision: 1633452
URL: http://svn.apache.org/r1633452
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57105
When parsing web.xml do not limit the buffer element of the jsp-property-group
element to integer values as the allowed values are <number>kb or none.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1633447
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java?rev=1633452&r1=1633451&r2=1633452&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
Tue Oct 21 20:33:51 2014
@@ -83,11 +83,11 @@ public class JspPropertyGroup {
}
public String getDefaultContentType() { return this.defaultContentType; }
- private Integer buffer = null;
+ private String buffer = null;
public void setBuffer(String buffer) {
- this.buffer = Integer.valueOf(buffer);
+ this.buffer = buffer;
}
- public Integer getBuffer() { return this.buffer; }
+ public String getBuffer() { return this.buffer; }
private Boolean errorOnUndeclaredNamespace = null;
public void setErrorOnUndeclaredNamespace(
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=1633452&r1=1633451&r2=1633452&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 21 20:33:51 2014
@@ -88,6 +88,11 @@
information in the constructor since it then gets logged at undesirable
times such as when using <code>StoreConfig</code>. (markt)
</fix>
+ <fix>
+ <bug>57105</bug>: When parsing web.xml do not limit the buffer element
+ of the jsp-property-group element to integer values as the allowed
+ values are <code><number>kb</code> or <code>none</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
