You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/03/23 09:55:32 UTC
svn commit: r1580472 - in /tomcat/tc6.0.x/trunk: STATUS.txt
build.properties.default
java/org/apache/catalina/servlets/DefaultServlet.java
webapps/docs/changelog.xml
Author: markt
Date: Sun Mar 23 08:55:32 2014
New Revision: 1580472
URL: http://svn.apache.org/r1580472
Log:
Use StringBuilder in DefaultServlet
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.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=1580472&r1=1580471&r2=1580472&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Mar 23 08:55:32 2014
@@ -49,12 +49,6 @@ PATCHES PROPOSED TO BACKPORT:
remm: no need to add i18n for something that will not happen
-1:
-* Use StringBuilder in DefaultServlet
- Apply only DefaultServlet.java part of the following patch:
- https://people.apache.org/~kkolinko/patches/StringBuilder/2009-11-02_StringBuilder_o_a_c_servlets.patch
- +1: kkolinko, schultz, remm
- -1:
-
* Fix possible overflow when parsing long values from a byte array.
http://people.apache.org/~markt/patches/2014-03-18-ascii-tc6.patch
+1: markt, kkolinko, schultz, remm
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1580472&r1=1580471&r2=1580472&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Sun Mar 23 08:55:32 2014
@@ -116,7 +116,7 @@ jdt.loc.1=http://archive.eclipse.org/ecl
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.1.27
+tomcat-native.version=1.1.29
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1580472&r1=1580471&r2=1580472&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sun Mar 23 08:55:32 2014
@@ -441,7 +441,7 @@ public class DefaultServlet
protected void doOptions(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- StringBuffer allow = new StringBuffer();
+ StringBuilder allow = new StringBuilder();
// There is a doGet method
allow.append("GET, HEAD");
// There is a doPost
@@ -1224,7 +1224,7 @@ public class DefaultServlet
InputStream xsltInputStream)
throws IOException, ServletException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("<?xml version=\"1.0\"?>");
sb.append("<listing ");
@@ -1352,7 +1352,7 @@ public class DefaultServlet
OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF8");
PrintWriter writer = new PrintWriter(osWriter);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
// rewriteUrl(contextPath) is expensive. cache result for later reuse
String rewrittenContextPath = rewriteUrl(contextPath);
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=1580472&r1=1580471&r2=1580472&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Mar 23 08:55:32 2014
@@ -63,6 +63,9 @@
<fix>
Don't log to standard out in SSLValve. (kkolinko/markt)
</fix>
+ <scode>
+ Use StringBuilder in DefaultServlet. (kkolinko)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org