svn commit: r1809684 - in /tomcat/trunk: java/org/apache/catalina/webresources/AbstractFileResourceSet.java test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
Author: markt
Date: Tue Sep 26 05:06:00 2017
New Revision: 1809684
URL: http://svn.apache.org/viewvc?rev=1809684&view=rev
Log:
Updates after kkolinko review
- Correct comment
- Use correct regular expression match (that makes regular expressions an even
worse option)
- Improve (roughly x2) performance of invalid filename check
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809684&r1=1809683&r2=1809684&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Tue Sep 26 05:06:00 2017
@@ -139,11 +139,11 @@ public abstract class AbstractFileResour
if (name.length() == 0) {
return false;
}
-// For typical length file names, this is 2-3 times faster than the
-// equivalent regular expression. The cut-over point is file names (not
-// full paths) of ~65 characters.
-char[] chars = name.toCharArray();
-for (char c : chars) {
+// This consistently ~10 times faster than the equivalent regular
+// expression irrespective of input length.
+final int len = name.length();
+for (int i = 0; i < len; i++) {
+char c = name.charAt(i);
if (c == '\"' || c == '<' || c == '>') {
// These characters are disallowed in Windows file names and
// there are known problems for file names with these
characters
@@ -154,11 +154,11 @@ public abstract class AbstractFileResour
return true;
}
}
-// Windows does allow file names to end in ' ' unless specific low
level
-// APIs are used to create the files that bypass various checks. File
-// names that end in ' ' are known to cause problems when using
+// Windows does not allow file names to end in ' ' unless specific low
+// level APIs are used to create the files that bypass various checks.
+// File names that end in ' ' are known to cause problems when using
// File#getCanonicalPath().
-if (chars[chars.length -1] == ' ') {
+if (name.charAt(len -1) == ' ') {
return true;
}
return false;
Modified:
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java?rev=1809684&r1=1809683&r2=1809684&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
Tue Sep 26 05:06:00 2017
@@ -27,7 +27,7 @@ public class TestAbstractFileResourceSet
private static final int LOOPS = 10_000_000;
/*
- * Checking individual characters is about 3 times faster on markt's dev
+ * Checking individual characters is about 10 times faster on markt's dev
* PC for typical length file names. The file names need to get to ~65
* characters before the Pattern matching is faster.
*/
@@ -36,7 +36,7 @@ public class TestAbstractFileResourceSet
long start = System.nanoTime();
for (int i = 0; i < LOOPS; i++) {
-UNSAFE_WINDOWS_FILENAME_PATTERN.matcher("testfile.jsp ").matches();
+UNSAFE_WINDOWS_FILENAME_PATTERN.matcher("testfile.jsp ").find();
}
long end = System.nanoTime();
System.out.println("Regular expression took " + (end - start) + "ns or
" +
@@ -44,14 +44,23 @@ public class TestAbstractFileResourceSet
start = System.nanoTime();
for (int i = 0; i < LOOPS; i++) {
-checkForBadChars("testfile.jsp ");
+checkForBadCharsArray("testfile.jsp ");
}
end = System.nanoTime();
System.out.println("char[] check took " + (end - start) + "ns or " +
(end-start)/LOOPS + "ns per iteration");
+
+start = System.nanoTime();
+for (int i = 0; i < LOOPS; i++) {
+checkForBadCharsAt("testfile.jsp ");
+}
+end = System.nanoTime();
+System.out.println("charAt() check took " + (end - start) + "ns or " +
+(end-start)/LOOPS + "ns per iteration");
+
}
-private boolean checkForBadChars(String filename) {
+private boolea
[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-test-nio2 (in module tomcat-8.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-tc8.0.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 11 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -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. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-test-nio2/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 20 mins Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Dexecute.test.nio2=true -Dtest.temp=output/test-tmp-NIO2 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dtest.accesslog=true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.7-SNAPSHOT.jar -Dexamples.sources.skip=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20170926.jar -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20170926/bin/openssl -Dexecute.test.nio=false -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dexecute.test.apr=false -Dexecute.test.bio=false -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170926-native-src.tar.gz -Dtest.repor ts=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20170926-native-src.tar.gz -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dtest.excludePerformance=true -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.0.x/true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.6-SNAPSHOT.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.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-junit4.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-8.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/publ
[GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) 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-trunk-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 19 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build) Work ended in a state of : Failed Elapsed: 35 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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-junit4.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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170926.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g ump/public/workspace/apache-commons/logging/target/commons-logging-20170926.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170926.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-24.0-jre-SNAPSHOT.jar - [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/TestValueExpressionImpl.java:34: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELArithmetic.java:26: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/lang/TestELSupport.java:30: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/el/parser/TestELParser.java:30: Extra separation in import group before 'org.junit.Ignore' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestAttributeParser.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestCompiler.java:29: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestGenerator.java:36: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestJspConfig.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParser.java:25: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-trunk/test/org/apache/jasper/compiler/TestScriptingV
[GUMP@vmgump-vm3]: Project tomcat-tc8.0.x-validate (in module tomcat-8.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-tc8.0.x-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 19 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.0.x-validate : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.0.x/tomcat-tc8.0.x-validate/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-validate.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 30 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-8.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-8.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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-junit4.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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170926.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g ump/public/workspace/apache-commons/logging/target/commons-logging-20170926.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170926.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-24.0-jre-SNAPSHOT.jar - [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/TestValueExpressionImpl.java:34: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELArithmetic.java:26: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/lang/TestELSupport.java:30: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/el/parser/TestELParser.java:28: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestCompiler.java:29: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestGenerator.java:36: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParser.java:25: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/TestParserNoStrictWhitespace.java:26: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-8.0.x/test/org/apache/jasper/compiler/Tes
[GUMP@vmgump-vm3]: Project tomcat-tc7.0.x-validate (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-validate has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 19 runs. 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-validate : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on checkstyle exists, no need to add for property checkstyle.jar. -INFO- Failed with reason build failed The following work was performed: http://vmgump-vm3.apache.org/tomcat-7.0.x/tomcat-tc7.0.x-validate/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-validate.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-validate (Type: Build) Work ended in a state of : Failed Elapsed: 30 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Dbase.path=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-build-libs -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar -Dexecute.validate=true validate [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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-junit4.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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170926.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g ump/public/workspace/apache-commons/logging/target/commons-logging-20170926.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170926.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-24.0-jre-SNAPSHOT.jar - [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestELInJsp.java:23: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestMethodExpressionImpl.java:30: Extra separation in import group before 'org.junit.Before' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/TestValueExpressionImpl.java:34: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELArithmetic.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/lang/TestELSupport.java:29: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/el/parser/TestELParser.java:28: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestAttributeParser.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestCompiler.java:28: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestGenerator.java:37: Extra separation in import group before 'org.junit.Assert' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestJspConfig.java:24: Extra separation in import group before 'org.junit.Test' [ImportOrder] [checkstyle] [ERROR] /srv/gump/public/workspace/tomcat-7.0.x/test/org/apache/jasper/compiler/TestParser.java:26: Extra sep
Re: svn commit: r1809669 - in /tomcat/trunk: java/org/apache/catalina/webresources/AbstractFileResourceSet.java java/org/apache/tomcat/util/compat/JrePlatform.java test/org/apache/catalina/webresource
2017-09-26 2:20 GMT+03:00 :
> Author: markt
> Date: Mon Sep 25 23:20:56 2017
> New Revision: 1809669
>
> URL: http://svn.apache.org/viewvc?rev=1809669&view=rev
> Log:
> Add some additional checks required on Windows to keep all the checks in one
> place and to avoid exceptions later in the processing.
> Includes utility class to determine if platform is Windows and performance
> test case for alternative implementations.
>
> Added:
> tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java (with
> props)
>
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
>(with props)
> Modified:
>
> tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> Added:
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java?rev=1809669&view=auto
> ==
> ---
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
> (added)
> +++
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
> Mon Sep 25 23:20:56 2017
> +package org.apache.catalina.webresources;
> +
> +import java.util.regex.Pattern;
> +
> +import org.junit.Test;
> +
> +public class TestAbstractFileResourceSetPerformance {
> +
> +private static final Pattern UNSAFE_WINDOWS_FILENAME_PATTERN =
> Pattern.compile(" $|[\"<>]");
> +
> +private static final int LOOPS = 10_000_000;
> +
> +/*
> + * Checking individual characters is about 3 times faster on markt's dev
> + * PC for typical length file names. The file names need to get to ~65
> + * characters before the Pattern matching is faster.
> + */
> +@Test
> +public void testFileNameFiltering() {
> +
> +long start = System.nanoTime();
> +for (int i = 0; i < LOOPS; i++) {
> +UNSAFE_WINDOWS_FILENAME_PATTERN.matcher("testfile.jsp
> ").matches();
This matches() here is wrong. With the pattern above it should be ".find()".
Using find() makes the result even worse,
find(): 1641ns per iteration.
matches(): 352ns per iteration
> +}
> +long end = System.nanoTime();
> +System.out.println("Regular expression took " + (end - start) + "ns
> or " +
> +(end-start)/LOOPS + "ns per iteration");
> +
> +start = System.nanoTime();
> +for (int i = 0; i < LOOPS; i++) {
> +checkForBadChars("testfile.jsp ");
> +}
> +end = System.nanoTime();
> +System.out.println("char[] check took " + (end - start) + "ns or " +
> +(end-start)/LOOPS + "ns per iteration");
start = System.nanoTime();
for (int i = 0; i < LOOPS; i++) {
checkForBadChars2("testfile.jsp ");
}
end = System.nanoTime();
System.out.println("charAt() check took " + (end - start) + "ns or " +
(end-start)/LOOPS + "ns per iteration");
> +}
> +
> +private boolean checkForBadChars(String filename) {
> +char[] chars = filename.toCharArray();
> +for (char c : chars) {
> +if (c == '\"' || c == '<' || c == '>') {
> +return false;
> +}
> +}
> +if (chars[chars.length -1] == ' ') {
> +return false;
> +}
> +return true;
> +}
Second variant, without array copying:
private boolean checkForBadChars2(String filename) {
final int len = filename.length();
for (int i = 0; i < len; i++) {
char c = filename.charAt(i);
if (c == '\"' || c == '<' || c == '>') {
return false;
}
}
if (filename.charAt(len - 1) == ' ') {
return false;
}
return true;
}
My result:
[junit] char[] check took 1019605894ns or 101ns per iteration
[junit] charAt() check took 773188173ns or 77ns per iteration
[junit] char[] check took 978054736ns or 97ns per iteration
[junit] charAt() check took 842951721ns or 84ns per iteration
> +}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1809669 - in /tomcat/trunk: java/org/apache/catalina/webresources/AbstractFileResourceSet.java java/org/apache/tomcat/util/compat/JrePlatform.java test/org/apache/catalina/webresource
2017-09-26 2:20 GMT+03:00 :
> Author: markt
> Date: Mon Sep 25 23:20:56 2017
> New Revision: 1809669
>
> URL: http://svn.apache.org/viewvc?rev=1809669&view=rev
> Log:
> Add some additional checks required on Windows to keep all the checks in one
> place and to avoid exceptions later in the processing.
> Includes utility class to determine if platform is Windows and performance
> test case for alternative implementations.
>
> Added:
> tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java (with
> props)
>
> tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
>(with props)
> Modified:
>
> tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809669&r1=1809668&r2=1809669&view=diff
> ==
> ---
> tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> (original)
> +++
> tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> Mon Sep 25 23:20:56 2017
> @@ -22,6 +22,7 @@ import java.net.MalformedURLException;
> import java.net.URL;
>
> import org.apache.catalina.LifecycleException;
> +import org.apache.tomcat.util.compat.JrePlatform;
> import org.apache.tomcat.util.http.RequestUtil;
>
> public abstract class AbstractFileResourceSet extends AbstractResourceSet {
> @@ -77,6 +78,12 @@ public abstract class AbstractFileResour
> return file;
> }
>
> +// Additional Windows specific checks to handle known problems with
> +// File.getCanonicalPath()
> +if (JrePlatform.IS_WINDOWS && isInvalidWindowsFilename(name)) {
> +return null;
> +}
> +
> // Check that this file is located under the WebResourceSet's base
> String canPath = null;
> try {
> @@ -127,6 +134,34 @@ public abstract class AbstractFileResour
> return file;
> }
>
> +
> +private boolean isInvalidWindowsFilename(String name) {
> +// For typical length file names, this is 2-3 times faster than the
> +// equivalent regular expression. The cut-over point is file names
> (not
> +// full paths) of ~65 characters.
> +char[] chars = name.toCharArray();
> +for (char c : chars) {
> +if (c == '\"' || c == '<' || c == '>') {
> +// These characters are disallowed in Windows file names and
> +// there are known problems for file names with these
> characters
> +// when using File#getCanonicalPath().
> +// Note: There are additional characters that are disallowed
> in
> +// Windows file names but these are not known to cause
> +// problems when using File#getCanonicalPath().
> +return true;
> +}
> +}
> +// Windows does allow file names to end in ' ' unless specific low
> level
I think it was meant "does not"
> +// APIs are used to create the files that bypass various checks. File
> +// names that end in ' ' are known to cause problems when using
> +// File#getCanonicalPath().
> +if (chars[chars.length -1] == ' ') {
I hope that the name is not a zero-length string is already checked
somewhere. Otherwise a ArrayIndexOutOfBoundsException might happen
here.
> +return true;
> +}
> +return false;
> +}
> +
> +
> /**
> * Return a context-relative path, beginning with a "/", that represents
> * the canonical version of the specified path after ".." and "."
> elements
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809675 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Author: markt Date: Mon Sep 25 23:55:12 2017 New Revision: 1809675 URL: http://svn.apache.org/viewvc?rev=1809675&view=rev Log: Fix array index problem Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 25 23:55:12 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763635
svn commit: r1809674 - /tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Author: markt
Date: Mon Sep 25 23:54:07 2017
New Revision: 1809674
URL: http://svn.apache.org/viewvc?rev=1809674&view=rev
Log:
Fix array index problem
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809674&r1=1809673&r2=1809674&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Mon Sep 25 23:54:07 2017
@@ -136,6 +136,9 @@ public abstract class AbstractFileResour
private boolean isInvalidWindowsFilename(String name) {
+if (name.length() == 0) {
+return false;
+}
// For typical length file names, this is 2-3 times faster than the
// equivalent regular expression. The cut-over point is file names (not
// full paths) of ~65 characters.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809673 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/webresources/ java/org/apache/tomcat/util/compat/ test/org/apache/catalina/webresources/ webapps/docs/
Author: markt Date: Mon Sep 25 23:41:19 2017 New Revision: 1809673 URL: http://svn.apache.org/viewvc?rev=1809673&view=rev Log: Add some additional checks required on Windows to keep all the checks in one place and to avoid exceptions later in the processing. Includes utility class to determine if platform is Windows and performance test case for alternative implementations. Added: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java - copied unchanged from r1809669, tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java - copied unchanged from r1809669, tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 25 23:41:19 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-
svn commit: r1809672 - in /tomcat/tc8.5.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: markt Date: Mon Sep 25 23:38:21 2017 New Revision: 1809672 URL: http://svn.apache.org/viewvc?rev=1809672&view=rev Log: Bump version for next dev cycle. Correct changlog Modified: tomcat/tc8.5.x/trunk/build.properties.default tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.properties.default?rev=1809672&r1=1809671&r2=1809672&view=diff == --- tomcat/tc8.5.x/trunk/build.properties.default (original) +++ tomcat/tc8.5.x/trunk/build.properties.default Mon Sep 25 23:38:21 2017 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=8 version.minor=5 -version.build=22 +version.build=23 version.patch=0 version.suffix=-dev Modified: tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default?rev=1809672&r1=1809671&r2=1809672&view=diff == --- tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc8.5.x/trunk/res/maven/mvn.properties.default Mon Sep 25 23:38:21 2017 @@ -39,7 +39,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases.https # Release version info -maven.asf.release.deploy.version=8.5.22 +maven.asf.release.deploy.version=8.5.23 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1809672&r1=1809671&r2=1809672&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Sep 25 23:38:21 2017 @@ -44,7 +44,17 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> - + + + + +61563: Correct typos in Spanish translation. Patch provided by +Gonzalo Vásquez. (csutherl) + + + + + @@ -92,10 +102,6 @@ Update fix for 59904 so that values less than zero are accepted instead of throwing a NegativeArraySizeException. (remm) - -61563: Correct typos in Spanish translation. Patch provided by -Gonzalo Vásquez. (csutherl) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[CANCELLED][VOTE] Release Apache Tomcat 8.5.22
I'm cancelling this vote to pick up the back-port of r1809669 Sorry for the delay and inconvenience. Mark On 22/09/17 21:34, Mark Thomas wrote: > The proposed Apache Tomcat 8.5.22 release is now available for voting. > > The major changes compared to the 8.5.21 release are: > > - Fix CVE-2017-12617 > > - Add ExtractingRoot, a new WebResourceRoot implementation that extracts > JARs to the work directory for improved performance when deploying > packed WAR files. > > Along with lots of other bug fixes and improvements. > > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.22/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1155/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_22/ > > The proposed 8.5.22 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 8.5.22 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809671 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Sep 25 23:31:36 2017 New Revision: 1809671 URL: http://svn.apache.org/viewvc?rev=1809671&view=rev Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1809671&r1=1809670&r2=1809671&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 25 23:31:36 2017 @@ -51,6 +51,12 @@ Use the correct path when loading the JVM logging.properties file for Java 9. (rjung) + +Add additional validation to the resource handling required to fix +CVE-2017-12617 on Windows. The checks were being performed elsewhere but +adding them to the resource handling ensures that the checks are always +performed. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809670 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Mon Sep 25 23:25:50 2017 New Revision: 1809670 URL: http://svn.apache.org/viewvc?rev=1809670&view=rev Log: 9.0.0 release cancelled Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1809670&r1=1809669&r2=1809670&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 25 23:25:50 2017 @@ -62,7 +62,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[CANCELLED][VOTE] Release Apache Tomcat 9.0.0
I'm cancelling this vote to pick up r1809669 Mark On 22/09/17 19:59, Mark Thomas wrote: > The proposed Apache Tomcat 9.0.0 release is now available for voting. > > The major changes compared to the 9.0.0.M27 release are: > > - Fix CVE-2017-12617 > > - Servlet 4.0 implementation is complete > > - Add the ability to reconfigure TLS connectors at runtime without > stopping the connector > > - Stricter validation of the Host header > > Along with lots of other bug fixes and improvements. > > > For full details, see the changelog: > http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml > > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.0/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1154/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0/ > > The proposed 9.0.0 release is: > [ ] Broken - do not release > [ ] Alpha - go ahead and release as 9.0.0 > [ ] Beta - go ahead and release as 9.0.0 > [ ] Stable - go ahead and release as 9.0.0 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809669 - in /tomcat/trunk: java/org/apache/catalina/webresources/AbstractFileResourceSet.java java/org/apache/tomcat/util/compat/JrePlatform.java test/org/apache/catalina/webresources/Te
Author: markt
Date: Mon Sep 25 23:20:56 2017
New Revision: 1809669
URL: http://svn.apache.org/viewvc?rev=1809669&view=rev
Log:
Add some additional checks required on Windows to keep all the checks in one
place and to avoid exceptions later in the processing.
Includes utility class to determine if platform is Windows and performance test
case for alternative implementations.
Added:
tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java (with
props)
tomcat/trunk/test/org/apache/catalina/webresources/TestAbstractFileResourceSetPerformance.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java?rev=1809669&r1=1809668&r2=1809669&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
Mon Sep 25 23:20:56 2017
@@ -22,6 +22,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import org.apache.catalina.LifecycleException;
+import org.apache.tomcat.util.compat.JrePlatform;
import org.apache.tomcat.util.http.RequestUtil;
public abstract class AbstractFileResourceSet extends AbstractResourceSet {
@@ -77,6 +78,12 @@ public abstract class AbstractFileResour
return file;
}
+// Additional Windows specific checks to handle known problems with
+// File.getCanonicalPath()
+if (JrePlatform.IS_WINDOWS && isInvalidWindowsFilename(name)) {
+return null;
+}
+
// Check that this file is located under the WebResourceSet's base
String canPath = null;
try {
@@ -127,6 +134,34 @@ public abstract class AbstractFileResour
return file;
}
+
+private boolean isInvalidWindowsFilename(String name) {
+// For typical length file names, this is 2-3 times faster than the
+// equivalent regular expression. The cut-over point is file names (not
+// full paths) of ~65 characters.
+char[] chars = name.toCharArray();
+for (char c : chars) {
+if (c == '\"' || c == '<' || c == '>') {
+// These characters are disallowed in Windows file names and
+// there are known problems for file names with these
characters
+// when using File#getCanonicalPath().
+// Note: There are additional characters that are disallowed in
+// Windows file names but these are not known to cause
+// problems when using File#getCanonicalPath().
+return true;
+}
+}
+// Windows does allow file names to end in ' ' unless specific low
level
+// APIs are used to create the files that bypass various checks. File
+// names that end in ' ' are known to cause problems when using
+// File#getCanonicalPath().
+if (chars[chars.length -1] == ' ') {
+return true;
+}
+return false;
+}
+
+
/**
* Return a context-relative path, beginning with a "/", that represents
* the canonical version of the specified path after ".." and "." elements
Added: tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java?rev=1809669&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JrePlatform.java Mon Sep 25
23:20:56 2017
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.compat;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+public class JrePlatform {
+
+private static final Str
[Bug 60594] RFC 7230/3986 url requirement that prevents unencoded curly braces should be optional, since it breaks existing sites
https://bz.apache.org/bugzilla/show_bug.cgi?id=60594 --- Comment #29 from Jeff --- I would like to ask for the ^ character. I'm not sure how to make a case for this. Its kind of important for us because we have been using this to denote financial indexes (similar to yahoo finance) and we have a large number of client installs that would all have to change to enforce uri encoding. This is basically holding up our migration to Tomcat. I think it would be preferable if we could select whatever characters we want to override. Its our site and we are the ones responsible for the security and functionality. Every entity that uses Tomcat might need different characters for different reasons. It would be easier to transition if they had access to an override. Clearly the default should be to override nothing but some sites are going to need this or that character to transition. I could ask to have our clients url encode everything but realistically that could take years to complete. I would prefer that this exemption be extended rather that having to hack the code base on our own as security updates would be more timely. -- 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: [GUMP@vmgump-vm3]: Project tomcat-trunk-validate (in module tomcat-trunk) failed
On 24/09/17 12:12, Konstantin Kolinko wrote:
> 2017-09-24 12:45 GMT+03:00 Rainer Jung :
>> The current Gump failures during validate might be due to the following
>> change in checkstyle:
>>
>> https://github.com/checkstyle/checkstyle/issues/5065
>>
>> Gump uses a snapshot of checkstyle.
>>
>> The complains should be mostly about additional separator lines e.g. between
>> static and non-static imports from the same packages. Example:
>>
>> ...
>> import static org.junit.Assert.assertEquals;
>>
>> import org.junit.Test;
>> ...
>>
>> OK, if I clean those up? Or do we want to keep our formatting here?
>
> I am OK to clean those, but I think checkstyle is wrong here.
>
> Maybe there is a way to explicitly configure relative order of
> "static" vs "non-static" imports in the same code (e.g. as separate
> explicit groups). Which of those must be ordered first ("import static
> org.junit" or "import org.junit") is debatable.
I'd be +1 to anything that Checkstyle and Eclipse can agree on.
Mark
>
> Also this is related to configuration instructions in
> \res\ide-support\eclipse\java-compiler-errors-warnings.txt
>
> [[[
> # Java -> Code Style -> Organize Imports
> ==
>
> The following configuration of "Organize Imports" setting can be
> recommended for a quick setup. The order is enforced by checkstyle, so for
> the authoritative definition look at in
> res/checkstyle/checkstyle.xml
>
> - java
> - javax
> - async
> - jsp2
> - [static] org.junit
> - org.junit
> - [static] org
> - org
> - com
> - util
> ]]]
>
> With the above configuration "Organize Imports" command in Eclipse
> places static and non-static imports into separate groups.
>
>
>> Am 24.09.2017 um 01:15 schrieb Bill Barker:
>>>
>>> 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-trunk-validate has an issue affecting its community
>>> integration.
>>> This issue affects 1 projects,
>>> and has been outstanding for 11 runs.
>>> The current state of this project is 'Failed', with reason 'Build Failed'.
>>> For reference only, the following projects are affected by this:
>>> - tomcat-trunk-validate : Tomcat 9.x, a web server implementing the
>>> Java Servlet 4.0,
>>> ...
>>>
>>>
>>> Full details are available at:
>>>
>>> http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/index.html
>>>
>>> That said, some information snippets are provided here.
>>>
>>> The following annotations (debug/informational/warning/error messages)
>>> were provided:
>>> -DEBUG- Dependency on checkstyle exists, no need to add for property
>>> checkstyle.jar.
>>> -INFO- Failed with reason build failed
>>>
>>>
>>>
>>> The following work was performed:
>>>
>>> http://vmgump-vm3.apache.org/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
>>> Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
>>> Work ended in a state of : Failed
>>> Elapsed: 37 secs
>>> Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true
>>> -Dbuild.sysclasspath=only org.apache.tools.ant.Main
>>> -Dgump.merge=/srv/gump/public/gump/work/merge.xml
>>> -Dbase.path=/srv/gump/public/workspace/tomcat-trunk/tomcat-build-libs
>>> -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar
>>> -Dexecute.validate=true validate
>>> [Working Directory: /srv/gump/public/workspace/tomcat-trunk]
>>> CLASSPATH:
>>> /usr/lib/jvm/java-8-oracle/lib/tools.jar:/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-junit4.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/checkstyle/target/checkstyle-8.3-SNAPSHOT.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20170924.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/commons-cli/target/commons-cli-1.5-SNAPSHOT.jar:/srv/gump/public/workspace/commons-lang-trunk/target/commons-lang3-3.7-SNAPSHOT.jar:/srv/g
>>>
>>> ump/public/workspace/apache-commons/logging/target/commons-logging-20170924.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20170924.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-24.0-jre-SNAPSHOT.jar
>>> -
>>> [checkstyle] [ERROR]
>>> /srv/gump/public/workspace/tomc
Re: small tiny issue with TC 8.5 ant "clean" target
On 24/09/17 14:13, George Stanchev wrote: > The "clean" target of the TC build file leaves "output\jdbc-pool" directory. > This is because the "clean" target first deletes the output dir [1] but then > calls the jdbc "clean" script [2] which recreates the directory in the > "output" location [3]. Why would [3] be called as part of a "clean" script? No idea. > Since this is really a small issue, do you want BZ issue submitted or someone > can address it as a regular cleanup. I'd recommend putting in in BZ so it doesn't get lost. That Tomcat 6 links looks wrong too. Mark > > > [1] > http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?view=markup#l2582 > [2] > http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/build.xml?view=markup#l2587 > [3] > http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/build.xml?view=markup#l215 > > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Java 9 TC shutdown warnings (reflection in WebappClassLoaderBase)
On 25/09/17 13:33, Coty Sutherland wrote: > On Sat, Sep 23, 2017 at 11:01 AM, Mark Thomas wrote: >> On 23/09/17 15:55, Rainer Jung wrote: >>> Hi all, >>> >>> when running TC 8.5.21 (9.0 should be the same) with Java 9 I get the >>> following warnings on STDOUT during shutdown: >> >> Tomcat 9 has the Java 9 fixes. 8.5.x doesn't. I've put together a list >> of the Java 9 commits that need to be back-ported. Now that Java 9 is >> final those back-ports need to happen. > > Have you shared/can you share the list of commits? I'd like to take a > look and see if I can help get 7.0.x and 8.0.x ready to go too. I haven't shared them and now I go back to re-read them my notes are somewhat disorganized. I'll try and post something more coherent on Wednesday. Mark > >> This is on my TODO list for after TomcatCon London on Tuesday. >> >> Mark >> >> >>> >>> WARNING: An illegal reflective access operation has occurred >>> WARNING: Illegal reflective access by >>> org.apache.catalina.loader.WebappClassLoaderBase >>> (file:/.../lib/catalina.jar) to field java.lang.Thread.threadLocals >>> WARNING: Please consider reporting this to the maintainers of >>> org.apache.catalina.loader.WebappClassLoaderBase >>> WARNING: Use --illegal-access=warn to enable warnings of further illegal >>> reflective access operations >>> WARNING: All illegal access operations will be denied in a future release >>> >>> >>> If I add the mentioned flag, I get more such lines, all referring to >>> org.apache.catalina.loader.WebappClassLoaderBase and then: >>> >>> field java.lang.Thread.threadLocals >>> field java.lang.Thread.inheritableThreadLocals >>> field java.lang.ThreadLocal$ThreadLocalMap.table >>> method java.lang.ThreadLocal$ThreadLocalMap.expungeStaleEntries() >>> field java.lang.ThreadLocal$ThreadLocalMap$Entry.value >>> field sun.rmi.transport.Target.ccl >>> field sun.rmi.transport.Target.stub >>> field sun.rmi.transport.ObjectTable.objTable >>> field sun.rmi.transport.ObjectTable.implTable >>> >>> Details may vary depending on the cleanup flags set in the loader, but >>> this is 8.5 with default settings. >>> >>> Regards, >>> >>> Rainer >>> >>> - >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >>> For additional commands, e-mail: dev-h...@tomcat.apache.org >>> >> >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61563] Typo for entry managerServlet.listed at org/apache/catalina/manager/LocalStrings_es.properties
https://bz.apache.org/bugzilla/show_bug.cgi?id=61563 Coty Sutherland changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED OS||All --- Comment #1 from Coty Sutherland --- Fixed in: - trunk for 9.0.1 onwards - 8.5.x for 8.5.22 onwards - 8.0.x for 8.0.47 onwards - 7.0.x for 7.0.82 onwards Thanks for the patch! -- 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: r1809648 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: csutherl Date: Mon Sep 25 17:54:44 2017 New Revision: 1809648 URL: http://svn.apache.org/viewvc?rev=1809648&view=rev Log: Moving changelog entry for bz#61563 to the correct release Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1809648&r1=1809647&r2=1809648&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Mon Sep 25 17:54:44 2017 @@ -92,6 +92,10 @@ Update fix for 59904 so that values less than zero are accepted instead of throwing a NegativeArraySizeException. (remm) + +61563: Correct typos in Spanish translation. Patch provided by +Gonzalo Vásquez. (csutherl) + @@ -308,10 +312,6 @@ pick up the latest Windows binaries built with APR 1.6.2 and OpenSSL 1.0.2l. (markt) - -61563: Correct typos in Spanish translation. Patch provided by -Gonzalo Vásquez. (csutherl) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809647 - in /tomcat/trunk: ./ java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml
Author: csutherl
Date: Mon Sep 25 17:54:11 2017
New Revision: 1809647
URL: http://svn.apache.org/viewvc?rev=1809647&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563
Correct typo in Spanish translation.
Patch provided by Gonzalo Vásquez.
Modified:
tomcat/trunk/ (props changed)
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/trunk/webapps/docs/changelog.xml (contents, props changed)
Propchange: tomcat/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 17:54:11 2017
@@ -1 +1,2 @@
-/tomcat/tc8.5.x/trunk:1802799,1808880
+/tomcat/tc8.0.x/trunk:1809644
+/tomcat/tc8.5.x/trunk:1802799,1808880,1809646
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=1809647&r1=1809646&r2=1809647&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
Mon Sep 25 17:54:11 2017
@@ -75,7 +75,7 @@ managerServlet.findleaksFail = FALLO - H
managerServlet.findleaksList = OK - Hallados fallos potenciales de memoria en
las siguientes aplicaciones:
managerServlet.findleaksNone = OK - No se han hallado fallos de memoria
managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria
inv\u00E1lida de contexto [{0}]
-managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal
[{0}]
+managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quina virtual
[{0}]
managerServlet.listitem = {0}:{1}:{2}:{3}
managerServlet.mkdirFail = FALLO - No pude crear directorio [{0}]
managerServlet.noCommand = FALLO - No se ha especificado comando
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1809647&r1=1809646&r2=1809647&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 25 17:54:11 2017
@@ -53,6 +53,14 @@
+
+
+
+61563: Correct typos in Spanish translation. Patch provided
by
+Gonzalo Vásquez. (csutherl)
+
+
+
Propchange: tomcat/trunk/webapps/docs/changelog.xml
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 25 17:54:11 2017
@@ -1 +1 @@
-/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934,1808880
+/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml:1781934,1808880,1809646
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809646 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml
Author: csutherl Date: Mon Sep 25 17:51:06 2017 New Revision: 1809646 URL: http://svn.apache.org/viewvc?rev=1809646&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563 Correct typo in Spanish translation. Patch provided by Gonzalo Vásquez. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 25 17:51:06 2017 @@ -1 +1,2 @@ +/tomcat/tc8.0.x/trunk:1809644 /tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377
svn commit: r1809645 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml
Author: csutherl Date: Mon Sep 25 17:47:08 2017 New Revision: 1809645 URL: http://svn.apache.org/viewvc?rev=1809645&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563 Correct typo in Spanish translation. Patch provided by Gonzalo Vásquez. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 25 17:47:08 2017 @@ -1,3 +1,3 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,1802814,180361 8,1806107,1806733,1807082-1807083,1808707,1808884,1809267 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217
svn commit: r1809644 - in /tomcat/tc8.0.x/trunk: java/org/apache/catalina/manager/LocalStrings_es.properties webapps/docs/changelog.xml
Author: csutherl
Date: Mon Sep 25 17:44:37 2017
New Revision: 1809644
URL: http://svn.apache.org/viewvc?rev=1809644&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61563
Correct typo in Spanish translation.
Patch provided by Gonzalo Vásquez.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties?rev=1809644&r1=1809643&r2=1809644&view=diff
==
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties
Mon Sep 25 17:44:37 2017
@@ -75,7 +75,7 @@ managerServlet.findleaksFail = FALLO - H
managerServlet.findleaksList = OK - Hallados fallos potenciales de memoria en
las siguientes aplicaciones\:
managerServlet.findleaksNone = OK - No se han hallado fallos de memoria
managerServlet.invalidPath = FALLO - Se ha especificado una trayectoria
inv\u00E1lida de contexto {0}
-managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quinda virutal
{0}
+managerServlet.listed = OK - Aplicaciones listadas para m\u00E1quina virtual
{0}
managerServlet.listitem = {0}\:{1}\:{2}\:{3}
managerServlet.mkdirFail = FALLO - No pude crear directorio [{0}]
managerServlet.noCommand = FALLO - No se ha especificado comando
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1809644&r1=1809643&r2=1809644&view=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Mon Sep 25 17:44:37 2017
@@ -221,6 +221,10 @@
Update fix for 59904 so that values less than zero are
accepted
instead of throwing a NegativeArraySizeException. (remm)
+
+61563: Correct typos in Spanish translation. Patch provided
by
+Gonzalo Vásquez. (csutherl)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61563] New: Typo for entry managerServlet.listed at org/apache/catalina/manager/LocalStrings_es.properties
https://bz.apache.org/bugzilla/show_bug.cgi?id=61563 Bug ID: 61563 Summary: Typo for entry managerServlet.listed at org/apache/catalina/manager/LocalStrings_es.properties Product: Tomcat 8 Version: 8.0.14 Hardware: Macintosh Status: NEW Severity: normal Priority: P2 Component: Manager Assignee: dev@tomcat.apache.org Reporter: gvasq...@waypoint.cl Target Milestone: Created attachment 35374 --> https://bz.apache.org/bugzilla/attachment.cgi?id=35374&action=edit typo fixes Two minor typos are present, for which I've included a small patch -- 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: r1809634 - /tomcat/tc7.0.x/tags/TOMCAT_7_0_82/
Author: violetagg Date: Mon Sep 25 14:22:40 2017 New Revision: 1809634 URL: http://svn.apache.org/viewvc?rev=1809634&view=rev Log: Need to re-tag Removed: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [Bug 61103] StatementCache potentially returning incorrect statement
On 2017-09-21 16:04, bugzi...@apache.org wrote: https://bz.apache.org/bugzilla/show_bug.cgi?id=61103 --- Comment #2 from Julian Reschke --- Still present in 7.0.81. Hi there. Is there anything I can do to get a Tomcat JDBC expert to look into this? FWIW, this issue is 100% reproducible; it just needs a checkout of Apache Jackrabbit Oak, and a local DB2 instance. Best regards, Julian - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Java 9 TC shutdown warnings (reflection in WebappClassLoaderBase)
On Sat, Sep 23, 2017 at 11:01 AM, Mark Thomas wrote: > On 23/09/17 15:55, Rainer Jung wrote: >> Hi all, >> >> when running TC 8.5.21 (9.0 should be the same) with Java 9 I get the >> following warnings on STDOUT during shutdown: > > Tomcat 9 has the Java 9 fixes. 8.5.x doesn't. I've put together a list > of the Java 9 commits that need to be back-ported. Now that Java 9 is > final those back-ports need to happen. Have you shared/can you share the list of commits? I'd like to take a look and see if I can help get 7.0.x and 8.0.x ready to go too. > This is on my TODO list for after TomcatCon London on Tuesday. > > Mark > > >> >> WARNING: An illegal reflective access operation has occurred >> WARNING: Illegal reflective access by >> org.apache.catalina.loader.WebappClassLoaderBase >> (file:/.../lib/catalina.jar) to field java.lang.Thread.threadLocals >> WARNING: Please consider reporting this to the maintainers of >> org.apache.catalina.loader.WebappClassLoaderBase >> WARNING: Use --illegal-access=warn to enable warnings of further illegal >> reflective access operations >> WARNING: All illegal access operations will be denied in a future release >> >> >> If I add the mentioned flag, I get more such lines, all referring to >> org.apache.catalina.loader.WebappClassLoaderBase and then: >> >> field java.lang.Thread.threadLocals >> field java.lang.Thread.inheritableThreadLocals >> field java.lang.ThreadLocal$ThreadLocalMap.table >> method java.lang.ThreadLocal$ThreadLocalMap.expungeStaleEntries() >> field java.lang.ThreadLocal$ThreadLocalMap$Entry.value >> field sun.rmi.transport.Target.ccl >> field sun.rmi.transport.Target.stub >> field sun.rmi.transport.ObjectTable.objTable >> field sun.rmi.transport.ObjectTable.implTable >> >> Details may vary depending on the cleanup flags set in the loader, but >> this is 8.5 with default settings. >> >> Regards, >> >> Rainer >> >> - >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1809589 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_82: ./ build.properties.default
Author: violetagg Date: Mon Sep 25 07:07:15 2017 New Revision: 1809589 URL: http://svn.apache.org/viewvc?rev=1809589&view=rev Log: Tag 7.0.82 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ (props changed) - copied from r1809588, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Sep 25 07:07:15 2017 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- --- svn:ignore (added) +++ svn:ignore Mon Sep 25 07:07:15 2017 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_82/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Sep 25 07:07:15 2017 @@ -0,0 +1,3 @@ +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,17
