[GUMP@vmgump]: 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. 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.apache.org/gump/public/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.apache.org/gump/public/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: 1 min 8 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150413.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150413.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150413.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150413.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-8.0.x/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-8.0.x/output/res/checkstyle [checkstyle] Running Checkstyle 6.6-SNAPSHOT on 2936 files [checkstyle] /srv/gump/public/workspace/tomcat-8.0.x/webapps/docs/config/cluster-manager.xml:140: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-8.0.x/build.xml:537: Got 1 errors and 0 warnings. Total time: 1 minute 8 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150413160004, vmgump.apache.org:vmgump:20150413160004 Gump E-mail Identifier (unique within run) #1. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: 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. 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.apache.org/gump/public/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.apache.org/gump/public/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: 1 min 15 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 -Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-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/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20150413.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/packages/commons-collections3/commons-collections-3.2.1.jar:/srv/gump/public/workspace/apache-commons/exec/target/commons-exec-1.3.1-SNAPSHOT.j ar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20150413.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20150413.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20150413.jar:/srv/gump/packages/guava/guava-18.0.jar - Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml build-prepare: [delete] Deleting directory /srv/gump/public/workspace/tomcat-trunk/output/build/temp [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/build/temp compile-prepare: download-validate: testexist: [echo] Testing for /srv/gump/public/workspace/checkstyle/target/checkstyle-6.6-SNAPSHOT.jar setproxy: downloadfile: validate: [mkdir] Created dir: /srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle [checkstyle] Running Checkstyle 6.6-SNAPSHOT on 2915 files [checkstyle] /srv/gump/public/workspace/tomcat-trunk/webapps/docs/config/cluster-manager.xml:133: Line matches the illegal pattern '\s+$'. BUILD FAILED /srv/gump/public/workspace/tomcat-trunk/build.xml:550: Got 1 errors and 0 warnings. Total time: 1 minute 14 seconds - To subscribe to this information via syndicated feeds: - RSS: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml - Atom: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml == Gump Tracking Only === Produced by Apache Gump(TM) version 2.3. Gump Run 20150413160004, vmgump.apache.org:vmgump:20150413160004 Gump E-mail Identifier (unique within run) #2. -- Apache Gump http://gump.apache.org/ [Instance: vmgump] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc8.0.x-test-apr (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-apr has an issue affecting its community integration. This issue affects 1 projects. 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-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/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-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-8.0.x/tomcat-tc8.0.x-test-apr/gump_work/build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr.html Work Name: build_tomcat-8.0.x_tomcat-tc8.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 10 mins 45 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150413-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150413/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150413.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150413-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-1.0.2/dest-20150413/bin/openssl -Dexecute.test.bio=false -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.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/public/workspace/tomcat-8.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.0.x/output/build/lib/tomcat-jni.jar:/srv
svn commit: r1673288 - /tomcat/trunk/webapps/docs/config/cluster-manager.xml
Author: markt Date: Mon Apr 13 21:31:26 2015 New Revision: 1673288 URL: http://svn.apache.org/r1673288 Log: whitespace police Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml Modified: tomcat/trunk/webapps/docs/config/cluster-manager.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/cluster-manager.xml?rev=1673288r1=1673287r2=1673288view=diff == --- tomcat/trunk/webapps/docs/config/cluster-manager.xml (original) +++ tomcat/trunk/webapps/docs/config/cluster-manager.xml Mon Apr 13 21:31:26 2015 @@ -130,7 +130,7 @@ /attribute attribute name=recordAllActions required=false pFlag whether send all actions for session across Tomcat cluster -nodes. If set to false, if already done something to the same attribute, +nodes. If set to false, if already done something to the same attribute, make sure don't send multiple actions across Tomcat cluster nodes. In that case, sends only the actions that have been added at last. Default is codefalse/code./p - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57808] Don't preload all charsets
https://bz.apache.org/bugzilla/show_bug.cgi?id=57808 --- Comment #3 from Konstantin Kolinko knst.koli...@gmail.com --- This preloading is necessary to avoid performance bottlenecks. (See history of that code, or search Bugzilla - bug 51400). As such, it cannot be removed. If one wants, it shall be possible to provide a user-configurable list of charsets as an opt-in feature (the same as suggested in comment 2), but Tomcat will behave as all the other charsets do not exist. -- 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
[GUMP@vmgump]: Project tomcat-tc7.0.x-test-apr (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-test-apr has an issue affecting its community integration. This issue affects 1 projects. 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-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -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. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test-apr/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 8 mins 51 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150413-native-src.tar.gz -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150413-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150413/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150413.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.exclu dePerformance=true -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/srv/gump/public/workspace/commons-dbcp-1.x -Dexecute.test.apr=true -Dexecute.test.bio=false -Dexecute.test.nio=false -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-20150413.jar -Dtest.temp=output/test-tmp-APR -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.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-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar
[GUMP@vmgump]: Project tomcat-trunk-test-apr (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-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/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-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 11 mins 51 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 -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150413-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.4-201406061215/ecj-4.4.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native/dest-20150413/lib -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20150413.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20150413-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest .openssl.path=/srv/gump/public/workspace/openssl-master/dest-20150413/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.4-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/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-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-trunk
[Tomcat Wiki] Update of JNDI_startTLs_HowTo by KonstantinKolinko
Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The JNDI_startTLs_HowTo page has been changed by KonstantinKolinko: https://wiki.apache.org/tomcat/JNDI_startTLs_HowTo?action=diffrev1=4rev2=5 Comment: Add link to BZ 49785. Note that this feature is available from Tomcat proper. + '''Note:''' Nowadays StartTLS support is implemented in JDNIRealm of Tomcat mdash; starting with Tomcat 7.0.60, 8.0.21 ([[https://bz.apache.org/bugzilla/show_bug.cgi?id=49785|BZ 49785]]). + + This old page describes an alternative solution and is kept as a historic reference. Note that BZ 49785 has a [[https://bz.apache.org/bugzilla/show_bug.cgi?id=49785#c1|link]] to this page. + + == JNDI StartTLS HowTo == + In reference to: http://www.mail-archive.com/users@tomcat.apache.org/msg80660.html this Howto describes the configuration of a JNDI Realm connecting to an LDAP directory using StartTLS for connection establishment. StartTLS is the method of negotiating a TLS connection. For LDAP it was first time in RFC 2830, then refined in RFC 4513. @@ -22, +28 @@ The code probably needs auditing. More testing. And definitely more tightening: e.g.: When starting the negotiation the client (Tomcat + `LdapTlsContextFactory`) sends an `SSLv2Hello`, which is anything but desirable. This could be due to Sun’s poor defaults in their SSL implementation, an oversight in the code, or because I’ve missed out a JVM startup options. - [[CategoryFAQ|CategoryFAQ]] + [[CategoryFAQ]] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57809] Don't store merged web.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809 --- Comment #2 from Konstantin Kolinko knst.koli...@gmail.com --- In Tomcat 7 the MERGED_WEB_XML (org.apache.tomcat.util.scan.MergedWebXml) attribute is used to pass web application configuration to Jasper. In Tomcat 8 it is unused, but it is used by Tomcat test cases (TestWebXml). Your simple patch will break the tests. In theory, there can be 3rd party code that uses this feature. http://markmail.org/message/hqnuyvikofmfcbl2 Offline generation of effective web.xml thread on 2012-09, one of first discussions of this issue. -- 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: r1673333 - /tomcat/native/branches/1.1.x/native/src/ssl.c
Author: billbarker
Date: Tue Apr 14 01:41:49 2015
New Revision: 167
URL: http://svn.apache.org/r167
Log:
openssl master handles thread id itself (and better than we do). No change if
compiling against any currently released version of openssl
Modified:
tomcat/native/branches/1.1.x/native/src/ssl.c
Modified: tomcat/native/branches/1.1.x/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/ssl.c?rev=167r1=1673332r2=167view=diff
==
--- tomcat/native/branches/1.1.x/native/src/ssl.c (original)
+++ tomcat/native/branches/1.1.x/native/src/ssl.c Tue Apr 14 01:41:49 2015
@@ -367,6 +367,7 @@ static void ssl_thread_lock(int mode, in
}
}
+#if (OPENSSL_VERSION_NUMBER 0x1010L) || defined(OPENSSL_USE_DEPRECATED)
static unsigned long ssl_thread_id(void)
{
/* OpenSSL needs this to return an unsigned long. On OS/390, the pthread
@@ -386,12 +387,15 @@ static unsigned long ssl_thread_id(void)
return (unsigned long)(apr_os_thread_current());
#endif
}
+#endif
static apr_status_t ssl_thread_cleanup(void *data)
{
UNREFERENCED(data);
CRYPTO_set_locking_callback(NULL);
+#if (OPENSSL_VERSION_NUMBER 0x1010L) || defined(OPENSSL_USE_DEPRECATED)
CRYPTO_set_id_callback(NULL);
+#endif
CRYPTO_set_dynlock_create_callback(NULL);
CRYPTO_set_dynlock_lock_callback(NULL);
CRYPTO_set_dynlock_destroy_callback(NULL);
@@ -492,7 +496,9 @@ static void ssl_thread_setup(apr_pool_t
APR_THREAD_MUTEX_DEFAULT, p);
}
+#if (OPENSSL_VERSION_NUMBER 0x1010L) || defined(OPENSSL_USE_DEPRECATED)
CRYPTO_set_id_callback(ssl_thread_id);
+#endif
CRYPTO_set_locking_callback(ssl_thread_lock);
/* Set up dynamic locking scaffolding for OpenSSL to use at its
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57809] Don't store merged web.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809 --- Comment #3 from Philippe Marschall kus...@gmx.net --- Which part of TestWebXml does it break? The test compiles and 19/19 tests are green. -- 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
[Bug 57808] Don't preload all charsets
https://bz.apache.org/bugzilla/show_bug.cgi?id=57808 --- Comment #4 from Philippe Marschall kus...@gmx.net --- I have read bug 51400 and my understanding is that preloading is not necessary to avoid performance bottlenecks. Preloading was discussed but I couldn't find the reasons why preloading was ultimately chosen. The reasons for other implementation decisions I could find (not caching misses, not storing permutations, …). My understanding is that avoiding calling (indirectly) Charset.forName() / Charset.lookup() during normal request processing is necessary to avoid performance bottlenecks. This is achieved by the caching even when avoiding the preloading. -- 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: [Tomcat Wiki] Update of JNDI_startTLs_HowTo by KonstantinKolinko
Am 14. April 2015 02:27:30 MESZ, schrieb Apache Wiki wikidi...@apache.org: Dear Wiki user, You have subscribed to a wiki page or wiki category on Tomcat Wiki for change notification. The JNDI_startTLs_HowTo page has been changed by KonstantinKolinko: https://wiki.apache.org/tomcat/JNDI_startTLs_HowTo?action=diffrev1=4rev2=5 Comment: Add link to BZ 49785. Note that this feature is available from Tomcat proper. + '''Note:''' Nowadays StartTLS support is implemented in JDNIRealm of Tomcat mdash; starting with Tomcat 7.0.60, 8.0.21 ([[https://bz.apache.org/bugzilla/show_bug.cgi?id=49785|BZ 49785]]). + + This old page describes an alternative solution and is kept as a historic reference. Note that BZ 49785 has a [[https://bz.apache.org/bugzilla/show_bug.cgi?id=49785#c1|link]] to this page. Thanks for updating the page. Felix + + == JNDI StartTLS HowTo == + In reference to: http://www.mail-archive.com/users@tomcat.apache.org/msg80660.html this Howto describes the configuration of a JNDI Realm connecting to an LDAP directory using StartTLS for connection establishment. StartTLS is the method of negotiating a TLS connection. For LDAP it was first time in RFC 2830, then refined in RFC 4513. @@ -22, +28 @@ The code probably needs auditing. More testing. And definitely more tightening: e.g.: When starting the negotiation the client (Tomcat + `LdapTlsContextFactory`) sends an `SSLv2Hello`, which is anything but desirable. This could be due to Sun’s poor defaults in their SSL implementation, an oversight in the code, or because I’ve missed out a JVM startup options. - [[CategoryFAQ|CategoryFAQ]] + [[CategoryFAQ]] - 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 57808] Don't preload all charsets
https://bz.apache.org/bugzilla/show_bug.cgi?id=57808 Remy Maucherat r...@apache.org changed: What|Removed |Added Severity|normal |enhancement --- Comment #2 from Remy Maucherat r...@apache.org --- In most cases, 5MB would be a trivial amount of memory, so how about using a flag with a system property for that (or something similar) ? -- 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
[Bug 57809] Don't store merged web.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809 Remy Maucherat r...@apache.org changed: What|Removed |Added Severity|normal |enhancement --- Comment #1 from Remy Maucherat r...@apache.org --- The constant doesn't look like it is used, but this may not be such a good idea. I'll leave the BZ open for further review. -- 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: r1673242 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Author: remm
Date: Mon Apr 13 17:22:05 2015
New Revision: 1673242
URL: http://svn.apache.org/r1673242
Log:
- Cleanup and simplify NIO2 SSL code.
- Use the scatter/gather variants of SSL engine.
- Remove the loop for the gather write (since the non SSL code will not always
write everything, this doesn't have to either).
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1673242r1=1673241r2=1673242view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Apr
13 17:22:05 2015
@@ -552,7 +552,7 @@ public class SecureNio2Channel extends N
private class FutureRead implements FutureInteger {
private final ByteBuffer dst;
private final FutureInteger integer;
-public FutureRead(ByteBuffer dst) {
+private FutureRead(ByteBuffer dst) {
this.dst = dst;
this.integer = sc.read(netInBuffer);
}
@@ -656,17 +656,17 @@ public class SecureNio2Channel extends N
}
private class FutureWrite implements FutureInteger {
-private ByteBuffer src;
+private final ByteBuffer src;
private FutureInteger integer = null;
private int written = 0;
private Throwable t = null;
-protected FutureWrite(ByteBuffer src) {
+private FutureWrite(ByteBuffer src) {
+this.src = src;
//are we closing or closed?
if (closing || closed) {
t = new IOException(sm.getString(channel.nio.ssl.closing));
return;
}
-this.src = src;
wrap();
}
@Override
@@ -755,71 +755,10 @@ public class SecureNio2Channel extends N
return new FutureWrite(src);
}
-private class ReadCompletionHandlerA implements
CompletionHandlerInteger, A {
-protected ByteBuffer dst;
-protected CompletionHandlerInteger, ? super A handler;
-protected ReadCompletionHandler(ByteBuffer dst,
CompletionHandlerInteger, ? super A handler) {
-this.dst = dst;
-this.handler = handler;
-}
-
-@Override
-public void completed(Integer nBytes, A attach) {
-if (nBytes.intValue() 0) {
-failed(new EOFException(), attach);
-} else {
-try {
-//the data read
-int read = 0;
-//the SSL engine result
-SSLEngineResult unwrap;
-do {
-//prepare the buffer
-netInBuffer.flip();
-//unwrap the data
-unwrap = sslEngine.unwrap(netInBuffer, dst);
-//compact the buffer
-netInBuffer.compact();
-if (unwrap.getStatus() == Status.OK ||
unwrap.getStatus() == Status.BUFFER_UNDERFLOW) {
-//we did receive some data, add it to our total
-read += unwrap.bytesProduced();
-//perform any tasks if needed
-if (unwrap.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK)
-tasks();
-//if we need more network data, then bail out for
now.
-if (unwrap.getStatus() == Status.BUFFER_UNDERFLOW)
{
-break;
-}
-} else if (unwrap.getStatus() ==
Status.BUFFER_OVERFLOW read 0) {
-//buffer overflow can happen, if we have read
data, then
-//empty out the dst buffer before we do another
read
-break;
-} else {
-//here we should trap BUFFER_OVERFLOW and call
expand on the buffer
-//for now, throw an exception, as we initialized
the buffers
-//in the constructor
-throw new
IOException(sm.getString(channel.nio.ssl.unwrapFail, unwrap.getStatus()));
-}
-} while ((netInBuffer.position() != 0)); //continue to
unwrapping as long as the input buffer has stuff
-// If everything is OK, so complete
-readPending = false;
-handler.completed(Integer.valueOf(read), attach);
-} catch (Exception e) {
-failed(e, attach);
-}
-}
-}
-
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/212 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1673102 Blamelist: kfujino Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56438] If jar scan does not find context config or TLD config, log a message
https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 --- Comment #7 from VIN reachme.va...@gmail.com --- (In reply to Mark Thomas from comment #5) (In reply to VIN from comment #3) Please review my patch and let me know in case of any problems. Part 1 looks generally OK. You need to use 4 spaces rather than tabs and I agree with the idea in comment #4 to delog log matches and non-matches. I'm less sure about a message with the counts. I think it is too noisy for info and it the summary is debug then why bother since the individual messages are there. [Pravallika]: I have changed my eclipse settings in such a way that only spaces will be used rather tabs. Not sure why tabs are coming in patch. I also felt that adding count gives too much info to the user. Part 2 needs works. Pluggability scans are more than just fragments and the patch needs to take that into account. [Pravallika]: I assume other than JARs only folders will be scanned(.class files). Is it OK to add them to JARsToSkip property in catalina.properties? If yes, I may need your help to do that. Also keep in mind the changes are made to trunk first and then back-ported so if the festure you are implementing isn't in trunk or 8.0.x then patches are required for those versions too. You might find it easier to deal with part 1 first and then part 2. [Pravallika]: Part1 (TLD scanning) is already available in 8.0 and recent trunks. Only 7.0 is not having. Part2 is not part of all 7, 8, 9 trunks. Based on your confirmation, i will give patch for Part1 to Tomcat7. Then i will giev individual patches for Part2 for all 3 versions. Let me know if this is OK. -- 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
[Bug 57799] MessageCreationException: Couldn't create SOAP message with Nio2 connector protocol
https://bz.apache.org/bugzilla/show_bug.cgi?id=57799 --- Comment #8 from Remy Maucherat r...@apache.org --- So the pending flag seems correct. The difference with non SSL is thus unexplained, and this needs a (simple) testcase. -- 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
[Bug 57788] NPE on session.addMessageHandler
https://bz.apache.org/bugzilla/show_bug.cgi?id=57788 Remy Maucherat r...@apache.org changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Remy Maucherat r...@apache.org --- r1672628, will be included in 8.0.22. Of course, it will only display a different error. Source for better test ? -- 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
[Bug 56438] If jar scan does not find context config or TLD config, log a message
https://bz.apache.org/bugzilla/show_bug.cgi?id=56438 --- Comment #6 from VIN reachme.va...@gmail.com --- (In reply to Justin Cranford from comment #4) The patch sounds great. Three small suggestions to make it just a little better: 1) Can you add a debug message to show positive matches? Logging negative matches is very useful since Tomcat's configuration uses exclusion filters, but in hindsight I think showing the positive matches too gives the developer more visibility into how many jars contain newer servlet 3.0 pieces. For example, if they notice multiple jars with fragments but offering similar functionality, they could decide to refactor their application to eliminate a few of those jars for a little more start up performance. [Pravallika]: Do you mean adding a log message to tell which JAR contains the fragments or TLDs? If multiple JARs contains them, then too many log messages will be added to the log file which may also slow down the start time. Please think of and let me know so that i can add a INFO message for them. 2) Is it possible to log a message at the end of scanning to show positive/negative match totals? I would recommend warning log level if either negative match total is 0, otherwise info or debug level. A warning seems appropriate here since unnecessary jar scanning has such a huge negative impact on startup performance. It would not overwhelm a new user, it gives them valuable feedback to optimize startup times using your new debug messages, and it would disappear automatically after they add all the necessary exclusion filters. 3) If you just added 1) and 2) that would be more than enough. However, you could go a step further and use your code to identify common jar files that should be filtered. If you added some of them to the default exclusion filters in catalina.properties then new users would get greater performance out of default installs. [Pravallika]: In the bug itself there are several JARs mentioned which does not contain any TLds or fragments. Hence i can add them in catalina.properties. Please let me know your opinion. -- 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
[Bug 57801] Tomcat catalina.sh fails to start after machine is reboot because there is another process have the same PID as Tomcat before reboot
https://bz.apache.org/bugzilla/show_bug.cgi?id=57801
--- Comment #7 from jia...@gmail.com ---
Thanks Rainer and Christopher
It's not worth to set up a ramdisk to store the PID file.
If the PID file is stored in /tmp, the PID file may be rm-ed by someone.
The script should work in worst case even it's rare. The script should not
depend on the last state, it should be stateless.
The key point is catalina.sh treat the wrong process to be tomcat process.
Do we really need PID file to save the PID?
If we have issues with cross platform to verify the home path, maybe we could
first get the home path of the tomcat and then use this path to grep the right
PID in the result of ps(assuming the key commands in the following functions
exist in multiple unix/linux like OS).
Maybe we could get the PID of tomcat by some function like the following?
function get_tomcat_pid()
{
declare NORMALIZED=$(echo $CATALINA_HOME | tr -s / /)
declare NORMALIZED_PATH=$(readlink -f $CATALINA_HOME)
if [ $NORMALIZED != $NORMALIZED_PATH ]; then
NORMALIZED=$NORMALIZED_PATH
fi
if [ -z $NORMALIZED -a ${NORMALIZED+x} = x ] ; then
return 1
fi
declare pid=`ps -ef | grep $NORMALIZED | grep -v grep | awk '{print $2}'`
if [ -z $pid -a ${pid+x} = x ] ; then
return 1
fi
echo $pid
}
Thanks for supporting the force start.
The abort cases such as can't remove or write the PID file should be abort,
it looks that it does't have permission. Maybe user use the wrong user to run
the process.
The abort cases such as PID file found but no matching process was found.
Stop aborted. , $CATALINA_PID was set but the specified file does not exist.
should be a warning.
--
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
buildbot exception in ASF Buildbot on tomcat-trunk
The Buildbot has detected a build exception on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/1130 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1673194 Blamelist: markt BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1673191 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SecureNio2Channel.java
Author: markt
Date: Mon Apr 13 13:53:52 2015
New Revision: 1673191
URL: http://svn.apache.org/r1673191
Log:
SNI support for NIO2
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1673191r1=1673190r2=1673191view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Mon Apr 13
13:53:52 2015
@@ -422,27 +422,15 @@ public class Nio2Endpoint extends Abstra
Nio2Channel channel = (useCaches) ? nioChannels.pop() : null;
if (channel == null) {
-// SSL setup
+SocketBufferHandler bufhandler = new SocketBufferHandler(
+socketProperties.getAppReadBufSize(),
+socketProperties.getAppWriteBufSize(),
+socketProperties.getDirectBuffer());
if (isSSLEnabled()) {
-SSLEngine engine = createSSLEngine();
-int appBufferSize =
engine.getSession().getApplicationBufferSize();
-SocketBufferHandler bufhandler = new SocketBufferHandler(
-Math.max(appBufferSize,
socketProperties.getAppReadBufSize()),
-Math.max(appBufferSize,
socketProperties.getAppWriteBufSize()),
-socketProperties.getDirectBuffer());
-channel = new SecureNio2Channel(engine, bufhandler, this);
+channel = new SecureNio2Channel(bufhandler, this);
} else {
-SocketBufferHandler bufhandler = new SocketBufferHandler(
-socketProperties.getAppReadBufSize(),
-socketProperties.getAppWriteBufSize(),
-socketProperties.getDirectBuffer());
channel = new Nio2Channel(bufhandler);
}
-} else {
-if (isSSLEnabled()) {
-SSLEngine engine = createSSLEngine();
-((SecureNio2Channel) channel).setSSLEngine(engine);
-}
}
Nio2SocketWrapper socketWrapper = new Nio2SocketWrapper(channel,
this);
channel.reset(socket, socketWrapper);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1673191r1=1673190r2=1673191view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Apr
13 13:53:52 2015
@@ -34,6 +34,10 @@ import javax.net.ssl.SSLEngineResult.Han
import javax.net.ssl.SSLEngineResult.Status;
import javax.net.ssl.SSLException;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.ByteBufferUtils;
+import org.apache.tomcat.util.net.SNIExtractor.SNIResult;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -41,8 +45,12 @@ import org.apache.tomcat.util.res.String
*/
public class SecureNio2Channel extends Nio2Channel {
-protected static final StringManager sm = StringManager.getManager(
-SecureNio2Channel.class.getPackage().getName());
+private static final Log log = LogFactory.getLog(SecureNio2Channel.class);
+private static final StringManager sm =
StringManager.getManager(SecureNio2Channel.class);
+
+// Value determined by observation of what the SSL Engine requested in
+// various scenarios
+private static final int DEFAULT_NET_BUFFER_SIZE = 16921;
protected ByteBuffer netInBuffer;
protected ByteBuffer netOutBuffer;
@@ -63,18 +71,15 @@ public class SecureNio2Channel extends N
private CompletionHandlerInteger, SocketWrapperBaseNio2Channel
handshakeReadCompletionHandler;
private CompletionHandlerInteger, SocketWrapperBaseNio2Channel
handshakeWriteCompletionHandler;
-public SecureNio2Channel(SSLEngine engine, SocketBufferHandler bufHandler,
-Nio2Endpoint endpoint0) {
+public SecureNio2Channel(SocketBufferHandler bufHandler, Nio2Endpoint
endpoint) {
super(bufHandler);
-sslEngine = engine;
-endpoint = endpoint0;
-int netBufSize = sslEngine.getSession().getPacketBufferSize();
+this.endpoint = endpoint;
if (endpoint.getSocketProperties().getDirectSslBuffer()) {
-netInBuffer = ByteBuffer.allocateDirect(netBufSize);
-
svn commit: r1673194 - in /tomcat/trunk: java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/config/http.xml webapps/docs/s
Author: markt
Date: Mon Apr 13 13:53:59 2015
New Revision: 1673194
URL: http://svn.apache.org/r1673194
Log:
Remove a BIO specific option
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/security-howto.xml
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1673194r1=1673193r2=1673194view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
Mon Apr 13 13:53:59 2015
@@ -99,13 +99,6 @@ public abstract class AbstractHttp11Jsse
public void setSessionTimeout(String
s){getEndpoint().setSessionTimeout(s);}
public String getSessionTimeout(){ return
getEndpoint().getSessionTimeout();}
-public void setAllowUnsafeLegacyRenegotiation(String s) {
-getEndpoint().setAllowUnsafeLegacyRenegotiation(s);
-}
-public String getAllowUnsafeLegacyRenegotiation() {
-return getEndpoint().getAllowUnsafeLegacyRenegotiation();
-}
-
public String getSslImplementationName() { return
getEndpoint().getSslImplementationName(); }
public void setSslImplementationName(String s) {
getEndpoint().setSslImplementationName(s); }
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1673194r1=1673193r2=1673194view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Apr
13 13:53:59 2015
@@ -1038,14 +1038,6 @@ public abstract class AbstractEndpointS
public String getSessionTimeout() { return sessionTimeout;}
public void setSessionTimeout(String s) { sessionTimeout = s;}
-private String allowUnsafeLegacyRenegotiation = null;
-public String getAllowUnsafeLegacyRenegotiation() {
-return allowUnsafeLegacyRenegotiation;
-}
-public void setAllowUnsafeLegacyRenegotiation(String s) {
-allowUnsafeLegacyRenegotiation = s;
-}
-
private String[] sslEnabledProtocolsarr = new String[0];
public String[] getSslEnabledProtocolsArray() {
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1673194r1=1673193r2=1673194view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Mon Apr 13 13:53:59 2015
@@ -1025,19 +1025,6 @@
documentation for the default value./p
/attribute
-attribute name=allowUnsafeLegacyRenegotiation required=false
- pIs unsafe legacy TLS renegotiation allowed which is likely to expose
- users to CVE-2009-3555, a man-in-the-middle vulnerability in the TLS
- protocol that allows an attacker to inject arbitrary data into the user's
- request. If not specified, a default of codefalse/code is used. This
- attribute only has an effect if the JVM does not support RFC 5746 as
- indicated by the presence of the pseudo-ciphersuite
- TLS_EMPTY_RENEGOTIATION_INFO_SCSV. This is available JRE/JDK 6 update 22
- onwards. Where RFC 5746 is supported the renegotiation - including
support
- for unsafe legacy renegotiation - is controlled by the JVM configuration.
- /p
-/attribute
-
attribute name=useServerCipherSuitesOrder required=false
p
Set to codetrue/code to enforce the server's cipher order
Modified: tomcat/trunk/webapps/docs/security-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/security-howto.xml?rev=1673194r1=1673193r2=1673194view=diff
==
--- tomcat/trunk/webapps/docs/security-howto.xml (original)
+++ tomcat/trunk/webapps/docs/security-howto.xml Mon Apr 13 13:53:59 2015
@@ -294,15 +294,6 @@
proxy (the authenticated user name is passed to Tomcat as part of the AJP
protocol) with the option for Tomcat to still perform authorization./p
- pThe strongallowUnsafeLegacyRenegotiation/strong attribute provides
- a workaround for
- a href=http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3555;
- CVE-2009-3555/a, a TLS man in the middle attack. This workaround
applies
- to the BIO connector. It is only necessary if the underlying SSL
- implementation is
svn commit: r1673192 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractEndpoint.java AbstractJsseEndpoint.java
Author: markt
Date: Mon Apr 13 13:53:54 2015
New Revision: 1673192
URL: http://svn.apache.org/r1673192
Log:
Move JSSE specific method to JSSE base class
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1673192r1=1673191r2=1673192view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Apr
13 13:53:54 2015
@@ -32,9 +32,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLParameters;
-
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState;
@@ -1076,23 +1073,6 @@ public abstract class AbstractEndpointS
.newSetFromMap(new ConcurrentHashMapSocketWrapperBaseS,
Boolean());
/**
- * Configures SSLEngine to honor cipher suites ordering based upon
- * endpoint configuration.
- */
-protected void configureUseServerCipherSuitesOrder(SSLEngine engine) {
-String useServerCipherSuitesOrderStr = this
-.getUseServerCipherSuitesOrder().trim();
-
-SSLParameters sslParameters = engine.getSSLParameters();
-boolean useServerCipherSuitesOrder =
-(true.equalsIgnoreCase(useServerCipherSuitesOrderStr)
-|| yes.equalsIgnoreCase(useServerCipherSuitesOrderStr));
-
-sslParameters.setUseCipherSuitesOrder(useServerCipherSuitesOrder);
-engine.setSSLParameters(sslParameters);
-}
-
-/**
* The async timeout thread.
*/
private AsyncTimeout asyncTimeout = null;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1673192r1=1673191r2=1673192view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon
Apr 13 13:53:54 2015
@@ -19,6 +19,7 @@ package org.apache.tomcat.util.net;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLSessionContext;
import javax.net.ssl.X509KeyManager;
@@ -92,6 +93,24 @@ public abstract class AbstractJsseEndpoi
}
+/**
+ * Configures SSLEngine to honor cipher suites ordering based upon
+ * endpoint configuration.
+ */
+private void configureUseServerCipherSuitesOrder(SSLEngine engine) {
+String useServerCipherSuitesOrderStr = this
+.getUseServerCipherSuitesOrder().trim();
+
+SSLParameters sslParameters = engine.getSSLParameters();
+boolean useServerCipherSuitesOrder =
+(true.equalsIgnoreCase(useServerCipherSuitesOrderStr)
+|| yes.equalsIgnoreCase(useServerCipherSuitesOrderStr));
+
+sslParameters.setUseCipherSuitesOrder(useServerCipherSuitesOrder);
+engine.setSSLParameters(sslParameters);
+}
+
+
private KeyManager[] wrap(KeyManager[] managers) {
if (managers==null) return null;
KeyManager[] result = new KeyManager[managers.length];
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1673193 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AbstractJsseEndpoint.java LocalStrings.properties SecureNio2Channel.java SecureNioChannel.java
Author: markt
Date: Mon Apr 13 13:53:56 2015
New Revision: 1673193
URL: http://svn.apache.org/r1673193
Log:
Pass the SNI host name to the SSLEngine creation since the engine
created is going to have to depend on the SNI host name.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1673193r1=1673192r2=1673193view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Mon
Apr 13 13:53:56 2015
@@ -66,7 +66,7 @@ public abstract class AbstractJsseEndpoi
}
-protected SSLEngine createSSLEngine() {
+protected SSLEngine createSSLEngine(String sniHostName) {
SSLEngine engine = sslContext.createSSLEngine();
if (false.equals(getClientAuth())) {
engine.setNeedClientAuth(false);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1673193r1=1673192r2=1673193view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon
Apr 13 13:53:56 2015
@@ -96,6 +96,7 @@ channel.nio.ssl.closing=Channel is in cl
channel.nio.ssl.invalidBuffer=You can only read using the application read
buffer provided by the handler.
channel.nio.ssl.expandNetInBuffer=Expanding network input buffer to [{0}] bytes
channel.nio.ssl.expandNetOutBuffer=Expanding network output buffer to [{0}]
bytes
+channel.nio.ssl.sniHostName=The SNI host name extracted for this connection
was [{0}]
sniExtractor.clientHelloTooBig=The ClientHello was not presented in a single
TLS record so no SNI information could be extracted
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1673193r1=1673192r2=1673193view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Mon Apr
13 13:53:56 2015
@@ -346,12 +346,11 @@ public class SecureNio2Channel extends N
break;
}
-// TODO: Extract the correct configuration for the requested host name
-// and set up the SSLEngine accordingly. At that point this can
-// become a debug level message.
-log.info(SNI hostname was [ + hostName + ]);
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(channel.nio.ssl.sniHostName, hostName));
+}
-sslEngine = endpoint.createSSLEngine();
+sslEngine = endpoint.createSSLEngine(hostName);
// Ensure the application buffers (which have to be created earlier)
are
// big enough.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1673193r1=1673192r2=1673193view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Apr
13 13:53:56 2015
@@ -261,12 +261,11 @@ public class SecureNioChannel extends Ni
break;
}
-// TODO: Extract the correct configuration for the requested host name
-// and set up the SSLEngine accordingly. At that point this can
-// become a debug level message.
-log.info(SNI hostname was [ + hostName + ]);
+if (log.isDebugEnabled()) {
+log.debug(sm.getString(channel.nio.ssl.sniHostName, hostName));
+}
-sslEngine = endpoint.createSSLEngine();
+sslEngine = endpoint.createSSLEngine(hostName);
// Ensure the application buffers (which have to be created earlier)
are
// big enough.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1673199 - /tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Author: markt Date: Mon Apr 13 14:04:28 2015 New Revision: 1673199 URL: http://svn.apache.org/r1673199 Log: Make checkstyle happy Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1673199r1=1673198r2=1673199view=diff == --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Apr 13 14:04:28 2015 @@ -32,6 +32,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import javax.net.ssl.KeyManagerFactory; + import org.apache.juli.logging.Log; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1673169 - in /tomcat/tc7.0.x/trunk: java/org/apache/tomcat/websocket/Util.java webapps/docs/changelog.xml
Author: remm
Date: Mon Apr 13 12:22:56 2015
New Revision: 1673169
URL: http://svn.apache.org/r1673169
Log:
Merge r1672628
57788: Avoid NPE if nothing is found after going through the whole class
hierarchy.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java
(contents, props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1673169r1=1673168r2=1673169view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java Mon Apr 13
12:22:56 2015
@@ -209,6 +209,10 @@ public class Util {
@SuppressWarnings(unchecked)
Class? extends T superClazz =
(Class? extends T) clazz.getSuperclass();
+if (superClazz == null) {
+// Finished looking up the class hierarchy without finding anything
+return null;
+}
TypeResult superClassTypeResult = getGenericType(type, superClazz);
int dimension = superClassTypeResult.getDimension();
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 13 12:22:56 2015
@@ -0,0 +1,2 @@
+/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/Util.java: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,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,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,1667
767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1672629
+/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240
046,1240101,1240106,1240109,1240112,1240114,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1
svn commit: r1673189 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
Author: markt
Date: Mon Apr 13 13:50:55 2015
New Revision: 1673189
URL: http://svn.apache.org/r1673189
Log:
Fix buffer expansion.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java?rev=1673189r1=1673188r2=1673189view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketBufferHandler.java Mon
Apr 13 13:50:55 2015
@@ -151,9 +151,9 @@ public class SocketBufferHandler {
public void expand(int newSize) {
-configureReadBufferForRead();
+configureReadBufferForWrite();
readBuffer = ByteBufferUtils.expand(readBuffer, newSize);
-configureWriteBufferForRead();
+configureWriteBufferForWrite();
writeBuffer = ByteBufferUtils.expand(writeBuffer, newSize);
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1673188 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Author: markt
Date: Mon Apr 13 13:50:52 2015
New Revision: 1673188
URL: http://svn.apache.org/r1673188
Log:
Restore the creation of the network buffers to the construction.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1673188r1=1673187r2=1673188view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Mon Apr
13 13:50:52 2015
@@ -67,6 +67,16 @@ public class SecureNioChannel extends Ni
NioSelectorPool pool, NioEndpoint endpoint) {
super(channel, bufHandler);
+// Create the network buffers (these hold the encrypted data).
+if (endpoint.getSocketProperties().getDirectSslBuffer()) {
+netInBuffer = ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
+netOutBuffer = ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
+} else {
+netInBuffer = ByteBuffer.allocate(DEFAULT_NET_BUFFER_SIZE);
+netOutBuffer = ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
+}
+
+
// selector pool for blocking operations
this.pool = pool;
this.endpoint = endpoint;
@@ -221,20 +231,7 @@ public class SecureNioChannel extends Ni
* provided host name, configure the SSLEngine for this connection.
*/
private int processSNI() throws IOException {
-SocketProperties sp = endpoint.getSocketProperties();
-
-// Create the network input buffer as data needs to be read into this
-// to be able to peek at it.
-if (netInBuffer == null) {
-if (sp.getDirectSslBuffer()) {
-netInBuffer =
ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
-netOutBuffer =
ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
-} else {
-netInBuffer = ByteBuffer.allocate(DEFAULT_NET_BUFFER_SIZE);
-netOutBuffer =
ByteBuffer.allocateDirect(DEFAULT_NET_BUFFER_SIZE);
-}
-}
-
+// Read some data into the network input buffer so we can peek at it.
sc.read(netInBuffer);
SNIExtractor extractor = new SNIExtractor(netInBuffer);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57808] New: Don't preload all charsets
https://bz.apache.org/bugzilla/show_bug.cgi?id=57808 Bug ID: 57808 Summary: Don't preload all charsets Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: kus...@gmx.net Created attachment 32646 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32646action=edit simple patch I analyzed several heap dumps and and for small applications it seems that Tomcat uses about twice as much memory as Jetty (roughly 20MB vs 10MB). Most of this seems to come from Charset instances. While the number of Charsets is low some of them (mostly EBCDIC and GB18030) have quite large coding tables. The attached patch only preloads UTF-8 and ISO-8859-1, this saves about 5MB. That doesn't sound drastic but makes Tomcat to go from about 17.5MB to 12.5MB. Due to the discussion in 51400 I decided not to cache look up failures. I decided to use a ConcurrentHashMap so that readers never block. In theory a fully synchronized map could also be used as look up times should be low and therefore the lock should be uncontended most of the time. See the attached heap dumps for applications before and after 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
[Bug 57808] Don't preload all charsets
https://bz.apache.org/bugzilla/show_bug.cgi?id=57808 --- Comment #1 from Philippe Marschall kus...@gmx.net --- The heap dumps would be around 7MB compressed so I can't attach them. Where should I post them? -- 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
[Bug 57809] New: Don't store merged web.xml
https://bz.apache.org/bugzilla/show_bug.cgi?id=57809 Bug ID: 57809 Summary: Don't store merged web.xml Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: kus...@gmx.net Created attachment 32647 -- https://bz.apache.org/bugzilla/attachment.cgi?id=32647action=edit simple patch I analyzed several heap dumps to find out why for small applications Tomcat uses more memory than Jetty. Some of this seems to come from the fact that for ever web application a merged web.xml is stored in memory. A comment in ContextConfig suggests that this was once necessary for Jasper but it looks as if the relevant TODO has been fixed by now. On a default Tomcat with the default applications this saves about 1MB. -- 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
